Retain config file paths if specified

Signed-off-by: Alexei Barantsev <barancev@gmail.com>

Author: sbabcoc

java/server/src/org/openqa/grid/internal/cli/GridHubCliOptions.java

@@ -114,6 +114,9 @@ public GridHubConfiguration toConfiguration() {
 
     fillCommonConfiguration(configuration);
     fillCommonGridConfiguration(configuration);
+    if (configFile != null) {
+      configuration.hubConfig = configFile;
+    }
     if (capabilityMatcher != null) {
       configuration.capabilityMatcher = capabilityMatcher;
     }

java/server/src/org/openqa/grid/internal/cli/GridNodeCliOptions.java

@@ -226,6 +226,9 @@ public GridNodeConfiguration toConfiguration() {
         configuration.hubPort = hubPort;
       }
     }
+    if (configFile != null) {
+      configuration.nodeConfigFile = configFile;
+    }
     if (remoteHost != null) {
       configuration.remoteHost = remoteHost;
     }