(BugID: 100997) Confirm email: change "e-mail" references to "email"

This won't come back in MW upgrades as this change has been made in MW
core as well.
Merge branch 'bugid-100997' into dev