Merge proposals dependent on lp:~barryprice/openstack-mojo-specs/mojo-openstack-specs_add_xenial_mintaka

1. mojo-openstack-specs_add_xenial_mintaka
2. Dependent merge proposals