KNL-1051 Fix the locales handling so it is consistent



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