* Re-run gnocchi and ceilometer upgrade in step 5
* Add base constraint so gnocchi metricd is tied to core-clone