SAK-26145 merge 308526 309297 to 10.x

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