Merge proposals dependent on lp://staging/~canonical-platform-qa/snappy-ecosystem-tests/no-ephemeral-containers

1. no-ephemeral-containers
2. Dependent merge proposals