Merge proposals dependent on lp:~dave-cheney/juju-core/060-contrib-stress-test

lp:~dave-cheney/juju-core/060-contrib-stress-test has no merge proposals.