Merge proposals dependent on lp://qastaging/~kissiel/checkbox/fix-1416440

lp://qastaging/~kissiel/checkbox/fix-1416440 has no merge proposals.