Merge proposals dependent on lp://staging/~canonical-platform-qa/ubuntu-system-tests/initial-ap1.6-porting

1. initial-ap1.6-porting
2. Dependent merge proposals