Merge proposals dependent on lp://staging/~chris.macnaughton/charm-helpers/add-ceph-proxy

lp://staging/~chris.macnaughton/charm-helpers/add-ceph-proxy has no merge proposals.