THis has the approvals, but nees someone on stable to merge it. https://review.openstack.org/#/c/18049/