Merge proposals dependent on lp://staging/~canonical-platform-qa/ubuntu-ota-tests/remove-si-autopkgtest-workarounds

1. remove-si-autopkgtest-workarounds
2. Dependent merge proposals