Merge proposals dependent on lp:~dave-cheney/juju-core/trunk

lp:~dave-cheney/juju-core/trunk has no merge proposals.