Merge proposals dependent on lp://staging/~canonical-platform-qa/ubuntu-system-tests/helpers-autopilot-selftests

1. helpers-autopilot-selftests
2. Dependent merge proposals