https://review.openstack.org/#/c/574571/ and https://review.openstack.org/#/c/574920/ should fix this
https:/ /review. openstack. org/#/c/ 574571/ and https:/ /review. openstack. org/#/c/ 574920/ should fix this