minor clean up
Fix websocket termination
Doc: explain how to override conf with system props