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

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