KNL-101 merge 307352 307353 307374 307640 307652 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/sakai-10.x@307862 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1218 merge 307659 307671 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/sakai-10.x@307863 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1215 merge 307610 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/sakai-10.x@307864 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1164 merge 306735 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/sakai-10.x@307865 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1202 merge 307611 307613 307614 307615 307738 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/sakai-10.x@307866 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1160 merge 307695 to 10.x

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