[grid] cleanUpCycle option can be specified for a node too

Author: barancev

java/server/src/org/openqa/grid/internal/utils/configuration/GridConfiguration.java

@@ -75,6 +75,7 @@ public GridConfiguration(GridJsonConfiguration jsonConfig) {
 
  void merge(CommonGridCliOptions cliConfig) {
  super.merge(cliConfig);
+ ofNullable(cliConfig.getCleanUpCycle()).ifPresent(v -> cleanUpCycle = v);
  ofNullable(cliConfig.getServlets()).ifPresent(v -> servlets = v);
  ofNullable(cliConfig.getWithoutServlets()).ifPresent(v -> withoutServlets = v);
  ofNullable(cliConfig.getCustom()).ifPresent(v -> custom = v);

java/server/src/org/openqa/grid/internal/utils/configuration/GridHubConfiguration.java

@@ -97,7 +97,6 @@ public GridHubConfiguration(GridHubCliOptions cliConfig) {
  this(ofNullable(cliConfig.getConfigFile()).map(HubJsonConfiguration::loadFromResourceOrFile)
  .orElse(DEFAULT_CONFIG_FROM_JSON));
  super.merge(cliConfig);
- ofNullable(cliConfig.getCleanUpCycle()).ifPresent(v -> cleanUpCycle = v);
  ofNullable(cliConfig.getNewSessionWaitTimeout()).ifPresent(v -> newSessionWaitTimeout = v);
  ofNullable(cliConfig.getThrowOnCapabilityNotPresent()).ifPresent(v -> throwOnCapabilityNotPresent = v);
  ofNullable(cliConfig.getRegistry()).ifPresent(v -> registry = v);