Code review comment for lp://staging/~canonical-platform-qa/auto-upgrade-testing-specifications/rcS-workaround

1. rcS-workaround
2. Merge into auto-upgrade-testing-speci...