SAK-25771 merge 306240 306244 306273 306647 306799 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/master/branches/sakai-10.x@308036 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-26066 merge 307921 to 10.x

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