Issue #3249158: 馃彿 Add additional token for URL encoded email address.

Elliot Wardrequested to merge
issue/rest_password-3249158:3249158-url_encoded_mail_token into 9.x

Closes #3249158

Merge request reports