Changes to the SMTP settings for dev
Merged down from trunk