Fixes wrong locale variable code
Add a behat scenario for updating user preferences
Merge branch 'master' into pim-upgrade-beta5