Merge proposals dependent on lp:~dave-cheney/juju-core/122-fix-lp-1301706

lp:~dave-cheney/juju-core/122-fix-lp-1301706 has no merge proposals.