Most of these changes are to the socialtext code, to support mentoring-assignments work.