SAK-26286 merge 309840 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/web/branches/sakai-10.x@309911 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-25632 merge 308383 308426 to 10.x

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