Merge proposals dependent on lp://staging/~replaceafill/schooltool.cando/cando_fixes

lp://staging/~replaceafill/schooltool.cando/cando_fixes has no merge proposals.