change "smtpctl shutdown" back to "smtpctl stop"
Merge branch 'master' into portable