More reliable SMTP collector shutdown
Merge pull request #1179 from mfalesni/smtp-fix

More reliable SMTP collector shutdown