Addressed by (missed backports) https://review.openstack.org/#/c/312425/ , https://review.openstack.org/#/c/312424/
Addressed by (missed backports) https:/ /review. openstack. org/#/c/ 312425/ , https:/ /review. openstack. org/#/c/ 312424/