Merge with:
https://review.openstack.org/#/c/116724/ (Patch set 2)
https://review.openstack.org/#/c/118241/ (Patch set 3)
https://review.openstack.org/#/c/98730/ (Patch set 9)
https://review.openstack.org/#/c/96060/ (Patch set 11)