Merge proposals dependent on lp:~frankban/juju-quickstart/update-deps

lp:~frankban/juju-quickstart/update-deps has no merge proposals.