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