Merge proposals dependent on lp:~canonical-platform-qa/snappy-ecosystem-tests/setting-proxy-to-containers

1. setting-proxy-to-containers
2. Dependent merge proposals