SAK-25758 fix the bad merge from branch into trunk (r134229)


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