Merge proposals dependent on lp://staging/~corey.bryant/charms/trusty/ceph-osd/amulet-stable

lp://staging/~corey.bryant/charms/trusty/ceph-osd/amulet-stable has no merge proposals.