KNL-1035 merge r121484:121486,121884 from trunk


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