Merge proposals dependent on lp://staging/~canonical-platform-qa/snappy-ecosystem-tests/upload-private-snap-logged-out

1. upload-private-snap-logged-out
2. Dependent merge proposals