Merge proposals dependent on lp://qastaging/~kissiel/checkbox/cbt-fixes

lp://qastaging/~kissiel/checkbox/cbt-fixes has no merge proposals.