ERT SMTP port

 - add a property where the SMTP port can be overridden for ERT
 - revert an experimental commit that was used in ERT stage to test setting a server env variable