Merge proposals dependent on lp:~verifypn-cpn/verifypn/col_weight_fix

lp:~verifypn-cpn/verifypn/col_weight_fix has no merge proposals.