never swallow Lwt.Canceled exception
server thread now waits for ignored threads to finish
try to wait for fsm and messaging thread to finish before closing store and tlog
Merge remote-tracking branch 'refs/remotes/origin/fix-restart-master-long' into 1.6