SAK-26098 merge 308361 308485 to 10.x

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