Rocky - Backport: https://review.openstack.org/625692
Queens - Backport: https://review.openstack.org/625693
Rocky - Backport: https:/ /review. openstack. org/625692
Queens - Backport: https:/ /review. openstack. org/625693