KNL-921 merge r108080 for the second time. I incorrectly reverse merged this in r113300.


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