respect that server is started and stopped asynchronously
Merge branch 'async-start-stop'