Merge proposals dependent on lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-cloud-controller/trunk

lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-cloud-controller/trunk has no merge proposals.