KNL-1051 KNL-1052 merge fixed some missing bits from KNL-1052 which are necessary to allow the KNL-1051 tests to pass



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