KNL-1035 reverse merge of r122224


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