Cherry-pick of https://review.openstack.org/#/c/270008/ for stable/8.0 https://review.openstack.org/#/c/271748/
Cherry-pick of https:/ /review. openstack. org/#/c/ 270008/ /review. openstack. org/#/c/ 271748/
for stable/8.0
https:/