Merge proposals dependent on lp:~frankban/juju-quickstart/code-reorg

lp:~frankban/juju-quickstart/code-reorg has no merge proposals.