Merge proposals dependent on lp://staging/~brendan-donegan/checkbox/bug1157736

lp://staging/~brendan-donegan/checkbox/bug1157736 has no merge proposals.