Merge proposals dependent on lp:~hopem/charm-helpers/fix-peerstore-passwd-lp1451890

lp:~hopem/charm-helpers/fix-peerstore-passwd-lp1451890 has no merge proposals.