Merge proposals dependent on lp://staging/~brendan-donegan/checkbox-certification/story221_cpu_suspend_tests

1. story221_cpu_suspend_tests
2. Dependent merge proposals