Merge proposals dependent on lp://staging/~christopher-hoskin/ccid/csh

lp://staging/~christopher-hoskin/ccid/csh has no merge proposals.