KNL-1035 reverse merge r121484,r121485,r121486,r121884


git-svn-id: https://source.sakaiproject.org/svn/kernel/trunk@126062 66ffb92e-73f9-0310-93c1-f5514f145a0a