Openstack Mojo Testing

Merge proposals dependent on lp://staging/~chris.macnaughton/openstack-mojo-specs/upgrade-spec

  1. upgrade-spec
  2. Dependent merge proposals

lp://staging/~chris.macnaughton/openstack-mojo-specs/upgrade-spec has no merge proposals.