MLDS-540 MLDS-170 Extend user_id replacement of user_login to password_reset_token.
MLDS-676 Change default "From" address from @mailinator to @intelliware on dev/demo to avoid deliverability problems