Merge proposals dependent on lp://staging/~chris.macnaughton/openstack-mojo-specs/nova-compute-migration

1. nova-compute-migration
2. Dependent merge proposals