Merge proposals dependent on lp://staging/~gnuoy/openstack-mojo-specs/mojo-openstack-specs-fix-flavors

1. mojo-openstack-specs-fix-flavors
2. Dependent merge proposals