KNL-1123 merge 306327 306328 306334 307943 308063 308068 308304 308305 308404 to 10.x

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