Comment 6 for bug 1658629

There's some discussion of the other issues in this email thread: http://lists.openstack.org/pipermail/openstack-dev/2017-January/110953.html

It might make sense, however, to call this bug closed as fixing the rest of things is a bigger change and not really a bug fix. The code is behaving as intended right now (since the merge of the fix above), it's just that intent is not quite right