Update email field to mail and make sure email key is set afterwards.
requested to merge issue/openid_connect_windows_aad-3197898:3197898-email-field-not-mapped into 7.x-1.x
Closes #3197898
Update email field to mail and make sure email key is set afterwards.