Merge proposals dependent on lp://staging/~chris.macnaughton/charms/trusty/ceph-osd/add-infernalis

lp://staging/~chris.macnaughton/charms/trusty/ceph-osd/add-infernalis has no merge proposals.