Merged to stable/mitaka https://review.openstack.org/#/c/407911/
Merged to master https://review.openstack.org/#/c/407910/
Merged to stable/mitaka https:/ /review. openstack. org/#/c/ 407911/
Merged to master https:/ /review. openstack. org/#/c/ 407910/