Merge branch 'master' into p2p-dump

Author: courtneyeh

Diff for: services/beaconchain/src/main/java/tech/pegasys/teku/services/beaconchain/BeaconChainController.java

@@ -898,12 +898,12 @@ public void initValidatorApiHandler() {
         new GraffitiBuilder(
             beaconConfig.validatorConfig().getClientGraffitiAppendFormat(),
             beaconConfig.validatorConfig().getGraffitiProvider().get());
+    eventChannels.subscribe(ExecutionClientVersionChannel.class, graffitiBuilder);
     final ExecutionClientVersionProvider executionClientVersionProvider =
         new ExecutionClientVersionProvider(
             executionLayer,
             eventChannels.getPublisher(ExecutionClientVersionChannel.class),
             graffitiBuilder.getConsensusClientVersion());
-    eventChannels.subscribe(ExecutionClientVersionChannel.class, graffitiBuilder);
     final BlockOperationSelectorFactory operationSelector =
         new BlockOperationSelectorFactory(
             spec,

Diff for: teku/src/main/java/tech/pegasys/teku/cli/BeaconNodeCommand.java

@@ -212,7 +212,7 @@ private CommandLine getConfigFileCommandLine(final ConfigFileCommand configFileC
   }
 
   private CommandLine getCommandLine() {
-    return configureCommandLine(new CommandLine(this)).addSubcommand(validatorClientSubcommand);
+    return configureCommandLine(new CommandLine(this).addSubcommand(validatorClientSubcommand));
   }
 
   public int parse(final String[] args) {