Fixup whitespace
Fix JENKINS-16181

- Added a retry on SocketException occuring
- Added commented out main descriptor test, this will be used later