SAK-27850 merge 312655 from trunk

git-svn-id: https://source.sakaiproject.org/svn/msgcntr/branches/sakai-10.x@315257 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-27963 merge 314603 from trunk

git-svn-id: https://source.sakaiproject.org/svn/msgcntr/branches/sakai-10.x@315270 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-27874 merge 312672 from trunk

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