KNL-1260 merge 310020 310021 310037 310038 to 10.x

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