KNL-1163 merge 308178 308188 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/config/branches/sakai-10.x@308853 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1123 merge 306327 306328 306334 307943 308063 308068 308304 308305 308404 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/config/branches/sakai-10.x@308855 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-25926 merge 307399 307428 308500 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/config/branches/sakai-10.x@308856 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-24427 merge 308064 308484 to 10.x

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