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

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