SAK-26613 merge 310861 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/msgcntr/branches/sakai-10.x@311794 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-26619 merge 310865 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/msgcntr/branches/sakai-10.x@311799 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-26614 merge 310859 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/msgcntr/branches/sakai-10.x@311800 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-26611 merge 310858 to 10.x

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