Merge proposals dependent on lp://qastaging/~gnuoy/charms/trusty/ceph/fix-six-bug

lp://qastaging/~gnuoy/charms/trusty/ceph/fix-six-bug has no merge proposals.