make the hash generated based on the smtp properties more enviroment independent
Merge remote-tracking branch 'origin/4.0' into 4.0