Merge proposals dependent on lp://staging/~canonical-platform-qa/snappy-ecosystem-tests/adding-juju-bootstrapping

1. adding-juju-bootstrapping
2. Dependent merge proposals