Merge proposals dependent on lp:~canonical-ci-engineering/snappy-proposed-selftest-agent/pip-cache

1. pip-cache
2. Dependent merge proposals