SAK-24618 merge 309535 to 10.x

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

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

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

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