KNL-1015 KNL-1054 KNL-1048 KNL-1029 merge 119898,119916,119952,119964,121905,121906,121909,121942,121944,121945,121947,121948,121953,121963,121971,122059,122064,122068,122080,122090,122095,122328 from trunk


git-svn-id: https://source.sakaiproject.org/svn/config/branches/sakai-2.9.x@122360 66ffb92e-73f9-0310-93c1-f5514f145a0a