Merge branch 'master' into feature/show-username

Original commit: elastic/x-pack-elasticsearch@40649abc6c

elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/script/MockMustacheScriptEngine.java

@@ -46,12 +46,11 @@ public class MockMustacheScriptEngine extends MockScriptEngine {
     }
 
     @Override
-    public Object compile(String script, Map<String, String> params) {
+    public Object compile(String name, String script, Map<String, String> params) {
         if (script.contains("{{") && script.contains("}}")) {
             throw new IllegalArgumentException("Fix your test to not rely on mustache");
         }
 
-        return script;
+        return super.compile(name, script, params);
     }
-
 }

elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/script/SleepScriptEngine.java

@@ -55,8 +55,8 @@ public class SleepScriptEngine implements ScriptEngineService {
     }
 
     @Override
-    public Object compile(String script, Map<String, String> params) {
-        return script;
+    public Object compile(String scriptName, String scriptSource, Map<String, String> params) {
+        return scriptSource;
     }
 
     @Override