Refs: #205 Wait https://review.openstack.org/#/c/72449/ in stable/havana Please revert this commit when it's ok.