Closes #11959: SMTPServer and SMTPChannel now take an optional map, use of which avoids affecting global state.