Merge proposals dependent on lp://qastaging/~openstack-charm-sync/charms/trusty/ceph-osd/stable

lp://qastaging/~openstack-charm-sync/charms/trusty/ceph-osd/stable has no merge proposals.