Merge proposals dependent on lp://staging/~canonical-platform-qa/ubuntu-system-tests/fix-wizard-reporting-page

1. fix-wizard-reporting-page
2. Dependent merge proposals