Organize smtp logic in the bootstrapper.
Merge remote-tracking branch 'refs/remotes/ivan/feature/cleanup-smtpbootstrapper' into develop