Merge remote-tracking branch 'kibana/master' into move-saved-objects

# Conflicts:
#	src/legacy/core_plugins/visualizations/public/embeddable/visualize_embeddable.ts

.ci/Jenkinsfile_coverage

@@ -13,11 +13,7 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a
           ]) {
             parallel([
               'kibana-intake-agent': {
-                withEnv([
-                  'NODE_ENV=test' // Needed for jest tests only
-                ]) {
-                  kibanaPipeline.intakeWorker('kibana-intake', './test/scripts/jenkins_unit.sh')()
-                }
+                kibanaPipeline.intakeWorker('kibana-intake', './test/scripts/jenkins_unit.sh')()
               },
               'x-pack-intake-agent': {
                 withEnv([

src/cli/serve/integration_tests/__fixtures__/reload_logging_config/kibana.test.yml

@@ -1,8 +1,11 @@
 server:
+  autoListen: false
   port: 8274
 logging:
   json: true
 optimize:
   enabled: false
 plugins:
   initialize: false
+migrations:
+  skip: true

src/cli/serve/integration_tests/__fixtures__/reload_logging_config/kibana_log_console.test.yml

@@ -0,0 +1,22 @@
+server:
+  autoListen: false
+  port: 8274
+logging:
+  loggers:
+    - context: root
+      appenders:
+        - console
+      level: debug
+  appenders:
+    console:
+      kind: console
+      layout:
+        kind: json
+  root:
+    level: debug
+optimize:
+  enabled: false
+plugins:
+  initialize: false
+migrations:
+  skip: true

src/cli/serve/integration_tests/__fixtures__/reload_logging_config/kibana_log_file.test.yml

@@ -0,0 +1,22 @@
+server:
+  autoListen: false
+  port: 8274
+logging:
+  loggers:
+    - context: root
+      appenders:
+        - file
+      level: debug
+  appenders:
+    file:
+      kind: file
+      layout:
+        kind: pattern
+  root:
+    level: debug
+optimize:
+  enabled: false
+plugins:
+  initialize: false
+migrations:
+  skip: true