Merge proposals dependent on lp:~james-page/juju-deployer/fixup-subs-cli

lp:~james-page/juju-deployer/fixup-subs-cli has no merge proposals.