Return smtp's Port to be able to stop listening to it
Merge remote-tracking branch 'chiiph/feature/return_smtp_port' into develop