Merge remote-tracking branch 'origin/candidate-9.6.x' into candidate-9.8.x

Signed-off-by: Gordon Smith <[email protected]>

# Conflicts:
#	commons-hpcc/pom.xml
#	dfsclient/pom.xml
#	pom.xml
#	wsclient/pom.xml

Author: GordonSmith

dfsclient/src/main/java/org/hpccsystems/dfs/client/RowServiceInputStream.java

@@ -922,9 +922,6 @@ private int startFetch()
             {
                 try
                 {
-                    // Read handle before closing
-                    this.dis.readInt();
-
                     close();
                 }
                 catch (IOException e)
@@ -986,7 +983,8 @@ else if (this.handle == 0)
             {
                 if (dataLen == 0)
                 {
-                    dataLen = dis.readInt(); // need to read addl int here ...
+                    // Read handle before closing
+                    dis.readInt();
                     close();
                     return 0;
                 }