Merge proposals dependent on lp:~dave-cheney/juju-core/127-fix-lp-1305397

lp:~dave-cheney/juju-core/127-fix-lp-1305397 has no merge proposals.