Merge branch 'bugid-98005' into release-150 from dev branch as a p2 fix
Merge pull request #441 from Wikia/p2-fix-forgot-your-password-bugid-98005

Merge branch 'bugid-98005' into release-150 from dev branch as a p2 fix