Bug 817535 implementing Mozilla Basket

Rest of the fix

cleaning

email validation
Merge pull request #7386 from michalbe/ftu-email

[Bug #817535] implementing Mozilla Basket in FTE screen
Auto-merge from branch 'master'