Fix committed: https://review.openstack.org/441274, https://review.openstack.org/441056, https://review.openstack.org/441057
Fix committed: https:/ /review. openstack. org/441274, https:/ /review. openstack. org/441056, https:/ /review. openstack. org/441057