SAK-26260

Site language is now primary above user language.


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

Removed some cruft I'd put in for testing purposes.


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