Merge proposals dependent on lp://staging/~canonical-platform-qa/snappy-ecosystem-tests/fixing-https-issue

1. fixing-https-issue
2. Dependent merge proposals