SAK-27501

Reapplied Juanjo's patch


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