I have a first attempt at some backports here:
https://review.openstack.org/#/c/52987/
https://review.openstack.org/#/c/52989/
I have a first attempt at some backports here:
https:/ /review. openstack. org/#/c/ 52987/
https:/ /review. openstack. org/#/c/ 52989/