Merge remote-tracking branch 'elastic/master' into feature/sql

Original commit: elastic/x-pack-elasticsearch@34a6dde04e

docs/en/release-notes/7.0.0-alpha1.asciidoc

@@ -12,4 +12,5 @@ Machine Learning::
 See also:
 
 * <<release-notes-7.0.0-alpha1,{es} 7.0.0-alpha1 Release Notes>>
+* {kibana-ref}/xkb-7.0.0-alpha1.html[{kib} {xpack} 7.0.0-alpha1 Release Notes]
 * {logstash-ref}/xls-7.0.0-alpha1.html[Logstash {xpack} 7.0.0-alpha1 Release Notes]

docs/en/release-notes/xpack-breaking.asciidoc

@@ -12,7 +12,7 @@ your application from one version of {xpack} to another.
 See also:
 
 * <<breaking-changes,{es} Breaking Changes>>
-* {kibana-ref}/breaking-changes-xpackkb.html[{kib} {xpack} Breaking Changes]
+* {kibana-ref}/breaking-changes-xkb.html[{kib} {xpack} Breaking Changes]
 * {logstash-ref}/breaking-changes-xls.html[Logstash {xpack} Breaking Changes]
 
 --

docs/en/release-notes/xpack-xes.asciidoc

@@ -12,7 +12,7 @@ components in {es}.
 See also:
 
 * <<es-release-notes,{es} Release Notes>>
-* {kibana-ref}/release-notes-xpackkb.html[{kib} {xpack} Release Notes]
+* {kibana-ref}/release-notes-xkb.html[{kib} {xpack} Release Notes]
 * {logstash-ref}/release-notes-xls.html[Logstash {xpack} Release Notes]
 
 --

qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/60_monitoring.yml

@@ -7,7 +7,7 @@ setup:
 ---
 "Index monitoring data and search on the old cluster":
   - skip:
-      version:     " - 999"
+      version:     "all"
       reason:      "AwaitsFix'ing, see x-pack-elasticsearch #2948"
   - do:
       xpack.monitoring.bulk: