Added @Override on some client class methods
Fix #2648 : NPE when host not resolved in Address
Added runner/category on test
Resolved checkstyle issues
Minor cleanup
Merge pull request #2681 from pveentjer/fix/3.x/2648-npe-startup

Fix/3.x/2648 npe startup