master https://review.openstack.org/#/c/194102/ kilo cherry pick https://review.openstack.org/#/c/194213/
master https:/ /review. openstack. org/#/c/ 194102/ /review. openstack. org/#/c/ 194213/
kilo cherry pick https:/