KNL-1050 reverse merge most of r121962 minus the logging statements.


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