SAK-27798 merge 311981 to 10.x

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

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