[grid] Avoiding primitives for boolean configs

This overrides values configured in files. Also,
reverting change where files has more precedence
over flags. Avoiding primitives is enough for
this.

Author: diemol

java/server/src/org/openqa/selenium/grid/TemplateGridCommand.java

@@ -76,13 +76,13 @@ public final Executable configure(PrintStream out, PrintStream err, String... ar
       }
 
       // Order matters here. The configs precedence is: 1. Env vars, 2. System properties,
-      // 3. Configuration files (config.toml), 4. Cli flags and default values
+      // 3. Cli flags and default values, 4. Configuration files (config.toml)
       // 5. Default role config
       Set<Config> allConfigs = new LinkedHashSet<>();
       allConfigs.add(new EnvConfig());
       allConfigs.add(new ConcatenatingConfig(getSystemPropertiesConfigPrefix(), '.', System.getProperties()));
-      allConfigs.add(configFlags.readConfigFiles());
       allFlags.forEach(flags -> allConfigs.add(new AnnotatedConfig(flags)));
+      allConfigs.add(configFlags.readConfigFiles());
       allConfigs.add(getDefaultConfig());
 
       Config config = new MemoizedConfig(new CompoundConfig(allConfigs.toArray(new Config[0])));

java/server/src/org/openqa/selenium/grid/node/config/NodeOptions.java

@@ -148,7 +148,7 @@ private SessionFactory createSessionFactory(String clazz, Capabilities stereotyp
   private void addDetectedDrivers(
     Map<WebDriverInfo, Collection<SessionFactory>> allDrivers,
     ImmutableMultimap.Builder<Capabilities, SessionFactory> sessionFactories) {
-    if (!config.getBool(NODE_SECTION, "detect-drivers").orElse(false)) {
+    if (!config.getBool(NODE_SECTION, "detect-drivers").orElse(true)) {
       return;
     }
 
@@ -175,7 +175,7 @@ private Map<WebDriverInfo, Collection<SessionFactory>> discoverDrivers(
     int maxSessions,
     Function<WebDriverInfo, Collection<SessionFactory>> factoryFactory) {
 
-    if (!config.getBool(NODE_SECTION, "detect-drivers").orElse(false)) {
+    if (!config.getBool(NODE_SECTION, "detect-drivers").orElse(true)) {
       return ImmutableMap.of();
     }
 

java/server/src/org/openqa/selenium/grid/node/httpd/NodeFlags.java

@@ -42,9 +42,10 @@ public class NodeFlags implements HasRoles {
 
   @Parameter(
       names = {"--detect-drivers"}, arity = 1,
-      description = "Autodetect which drivers are available on the current system, and add them to the node.")
+      description = "Autodetect which drivers are available on the current system, " +
+                    "and add them to the node. Defaults to true.")
   @ConfigValue(section = "node", name = "detect-drivers", example = "true")
-  public Boolean autoconfigure = true;
+  public Boolean autoconfigure;
 
   @Parameter(
     names = {"-I", "--driver-implementation"},

java/server/src/org/openqa/selenium/grid/router/httpd/RouterFlags.java

@@ -37,7 +37,7 @@ public class RouterFlags implements HasRoles {
       " in contravention of strict W3C spec compliance.",
     arity = 1)
   @ConfigValue(section = "network", name = "relax-checks", example = "true")
-  private boolean relaxChecks;
+  private Boolean relaxChecks;
 
   @Override
   public Set<Role> getRoles() {