[Openstack-stable-maint] https://review.openstack.org/#/c/25233/

Hi, Any chance to get a review for this so that we can start to backport to the relevant projects? Thanks Gary