[Bug 817535] locale fix on FTU
Merge pull request #7439 from michalbe/ftu-email

[Bug 817535] locale fix on FTU
Auto-merge from branch 'master'