Allow -E in MultiCommand tools

Author: pugnascotia

libs/cli/src/main/java/org/elasticsearch/cli/MultiCommand.java

@@ -45,6 +45,9 @@ public class MultiCommand extends Command {
      */
     public MultiCommand(final String description, final Runnable beforeMain) {
         super(description, beforeMain);
+        // Accepting -E here does not prevent subcommands receiving -E arguments, since we also set `posixlyCorrect` below.
+        // This stops option parsing when the first non-option is encountered.
+        parser.accepts("E", "Unused. Pass to a subcommand instead").withRequiredArg();
         parser.posixlyCorrect(true);
     }
 

x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/tool/CronEvalTool.java

@@ -46,7 +46,7 @@ public static void main(String[] args) throws Exception {
             .withRequiredArg().ofType(Integer.class).defaultsTo(10);
         this.arguments = parser.nonOptions("expression");
 
-        parser.accepts("E", "Unused. Only for compatibility with other CLI tools.").withRequiredArg().ofType(KeyValuePair.class);
+        parser.accepts("E", "Unused. Only for compatibility with other CLI tools.").withRequiredArg();
     }
 
     @Override