KNL-1202 merge 307611 307613 307614 307615 307738 to 10.x

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