These need to be reviewed in master: - https://review.openstack.org/#/c/555550/ - https://review.openstack.org/#/c/556292/ Backports needing review: - https://review.openstack.org/#/c/555436/