KNL-1173 Reverse-merging r305985 to fix the broken build



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