SAM-2318 merge 308322 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-10.x@308662 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-25523 merge 306215 306221 306225 307233 307253 307254 307561 307566 307746 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-10.x@308860 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-24415 merge 308352 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-10.x@309247 66ffb92e-73f9-0310-93c1-f5514f145a0a
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