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

Author: jakesmith

dfsclient/src/test/java/org/hpccsystems/dfs/client/DFSReadWriteTest.java

@@ -66,7 +66,7 @@
 public class DFSReadWriteTest extends BaseRemoteTest
 {
     // Note: These datasets are generated by dfsclient/src/target/resources/generate-datasets.ecl
-    private static final String[] datasets       = { "~benchmark::integer::20kb", "~unit_test::all_types::thor",  "~unit_test::all_types::json", "~unit_test::all_types::csv" };
+    private static final String[] datasets       = { "~benchmark::integer::20kb", "~unit_test::all_types::thor", "~unit_test::all_types::json", "~unit_test::all_types::csv" };
     private static final int[]    expectedCounts = { 1250, 100000, 100000, 100000};
 
     private static final Version newProtocolVersion = new Version(8,12,10);