Merge proposals dependent on lp:~jorge/juju-core/fix-broken-pre

lp:~jorge/juju-core/fix-broken-pre has no merge proposals.