Merge branch 'candidate-4.2.10' into closedown-4.2.x

Conflicts:
	version.cmake

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

system/jlib/jsocket.cpp

@@ -2657,7 +2657,7 @@ IpAddress & queryHostIP()
     if (cachehostip.isNull()) {
         if (!cachehostip.ipset(GetCachedHostName())) {
             cachehostip.ipset(queryLocalIP());          
-            printf("hostname %s not resolved, using localhost\n",GetCachedHostName()); // don't use jlog in case recursive
+            // printf("hostname %s not resolved, using localhost\n",GetCachedHostName()); // don't use jlog in case recursive
         }
     }
     return cachehostip;