Add language and timezone to SelfService preferences
Merge branch '4.0/self-service-language-timezone-prefs' into 4.0-trunk