Merge proposals dependent on lp://staging/~tvansteenburgh/charms/precise/ceph-osd/fix-proof

lp://staging/~tvansteenburgh/charms/precise/ceph-osd/fix-proof has no merge proposals.