Merge proposals dependent on lp://qastaging/~brendan-donegan/click/deb_control_columns

lp://qastaging/~brendan-donegan/click/deb_control_columns has no merge proposals.