Merging SAK-26218 back into trunk


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