KNL-1018 merge trunk r118664

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.2.x@118906 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-997 merge r117028,117443

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.2.x@118907 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-967 merge 113040

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.2.x@118908 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-965 merge 112494

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.2.x@118909 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-928 merge trunk r108700

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.2.x@118910 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-926 merge trunk 108564,109904 and fix

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.2.x@118911 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-895 merge 105621

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.2.x@118913 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-821 merge trunk r100625

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.2.x@118914 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-819 merge trunk r100013

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