SAK-26285 merge r310681 from trunk


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


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