SmtpMonitor regex fixes + unit tests.
have to make sure we are in the right dir
Merge remote-tracking branch 'origin/1.10' into 1.12
Merge remote-tracking branch 'origin/1.12'
Merge remote-tracking branch 'origin/master' into pjsm/2.0