Properly stop the smtp daemon
Merge remote-tracking branch 'chiiph/bug/properly_stop_smtp' into develop