Restart java if socket connection fails after connected
Make socket connections more robust
add to setup doc
Reduce memory for long-running
Add to setup doc
Merge remote-tracking branch 'upstream/develop' into develop
Updates from upstream.