Merge proposals dependent on lp://staging/~frankban/juju-quickstart/remove-unused-code

lp://staging/~frankban/juju-quickstart/remove-unused-code has no merge proposals.