switched submodule back to elasticsearch/elasticsearch, updated the generator to properly pull updates from the related branch

test/integration/yaml_suite/client_manager.js

@@ -54,18 +54,20 @@ module.exports = {
         cb = options, options = {};
       }
 
-      var logConfig = _.has(options, 'logConfig')
-        ? options.logConfig
-        : {
-          type: BROWSER
-            ? 'console'
-            : VERBOSE
-              ? 'tracer'
-              : 'stdio',
-          level: VERBOSE
-            ? 'trace'
-            : 'warning'
-        };
+      var logConfig = {};
+      if (_.has(options, 'logConfig')) {
+        logConfig = options.logConfig;
+      } else {
+        if (BROWSER) {
+          logConfig.type = 'console';
+        } else if (JENKINS || !VERBOSE) {
+          logConfig.type = 'stdio';
+        } else {
+          logConfig.type = 'tracer';
+        }
+
+        logConfig.level = VERBOSE ? 'trace' : 'error';
+      }
 
       if (logConfig && logConfig.type === 'tracer') {
         try {

test/integration/yaml_suite/yaml_doc.js

@@ -135,15 +135,19 @@ function YamlDoc(doc, file) {
           if (err) {
             err.message += ' in ' + action.name;
           }
-          done(err);
+          process.nextTick(function () {
+            done(err);
+          });
         });
       } else {
         try {
           action.bound();
-          done();
+          process.nextTick(done);
         } catch (err) {
           err.message += ' in ' + action.name;
-          done(err);
+          process.nextTick(function () {
+            done(err);
+          });
         }
       }
     };