Merge proposals

juju-bootstrap-test has no merge proposals.