Merge proposals dependent on lp:~dave-cheney/juju-core/121-fix-lp-1301719

lp:~dave-cheney/juju-core/121-fix-lp-1301719 has no merge proposals.