Merging SAK-24999 to 2.9.x


git-svn-id: https://source.sakaiproject.org/svn/msgcntr/branches/msgcntr-3.0.x@314009 66ffb92e-73f9-0310-93c1-f5514f145a0a