This is a pain to backport given the changes, gone for a possible minimal fix:
https://review.openstack.org/#/c/52991/
https://review.openstack.org/#/c/52992/
This is a pain to backport given the changes, gone for a possible minimal fix:
https:/ /review. openstack. org/#/c/ 52991/
https:/ /review. openstack. org/#/c/ 52992/