SAK-24854 Merge 306375,306376 from trunk SAK-26615

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