Refs #4899 Added language selector in user settings
Fixes UI tests
Merge remote-tracking branch 'origin/master'