Merge proposals dependent on lp://qastaging/~sil2100/ubuntu-autopilot-tests/flush_ubuntu-integration-tests

1. flush_ubuntu-integration-tests
2. Dependent merge proposals