MSGCNTR-785 merge fix from UCT msub


git-svn-id: https://source.sakaiproject.org/svn/msgcntr/trunk@121819 66ffb92e-73f9-0310-93c1-f5514f145a0a