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

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