Merge proposals dependent on lp://staging/~chris.macnaughton/charms/trusty/ceph-mon/trunk

lp://staging/~chris.macnaughton/charms/trusty/ceph-mon/trunk has no merge proposals.