Merge proposals dependent on lp://qastaging/~james-page/charms/trusty/nova-compute/nova-cinder-rename

lp://qastaging/~james-page/charms/trusty/nova-compute/nova-cinder-rename has no merge proposals.