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

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