Fixes merged to stable/mitaka and master
https://review.openstack.org/#/c/326371 https://review.openstack.org/#/c/326370/
Fixes merged to stable/mitaka and master
https:/ /review. openstack. org/#/c/ 326371 /review. openstack. org/#/c/ 326370/
https:/