MSGCNTR-711 merge trunk r111636

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