Merge proposals dependent on lp:~frankban/juju-quickstart/minor-fixes-0

lp:~frankban/juju-quickstart/minor-fixes-0 has no merge proposals.