KNL-1050 reverse merge of r122225 minus the logging statements


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