KNL-1041 merge 121776,121777,123692,123942,123946 from trunk


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