SAK-26174 merge 308993 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-10.x@309205 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAM-2330 merge 309015 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-10.x@309206 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-26077 merge 308078 to 10.x

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