Merge proposals dependent on lp:~cypressyew/checkbox/bt-test-cleanup

lp:~cypressyew/checkbox/bt-test-cleanup has no merge proposals.