Changes required for merging in 7.x branch.

x-pack/plugin/enrich/build.gradle

@@ -10,10 +10,11 @@ esplugin {
 archivesBaseName = 'x-pack-enrich'
 
 dependencies {
-    compileOnly "org.elasticsearch:elasticsearch:${version}"
-
     compileOnly project(path: xpackModule('core'), configuration: 'default')
     testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
+    if (isEclipse) {
+        testCompile project(path: xpackModule('core-tests'), configuration: 'testArtifacts')
+    }
 }
 
 run {

x-pack/plugin/src/test/resources/rest-api-spec/api/enrich.delete_policy.json

@@ -1,6 +1,7 @@
 {
   "enrich.delete_policy": {
     "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/enrich-delete-policy.html",
+    "stability" : "stable",
     "methods": [ "DELETE" ],
     "url": {
       "path": "/_enrich/policy/{name}",

x-pack/plugin/src/test/resources/rest-api-spec/api/enrich.execute_policy.json

@@ -1,6 +1,7 @@
 {
   "enrich.execute_policy": {
     "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/enrich-execute-policy.html",
+    "stability" : "stable",
     "methods": [ "PUT" ],
     "url": {
       "path": "/_enrich/policy/{name}/_execute",

x-pack/plugin/src/test/resources/rest-api-spec/api/enrich.get_policy.json

@@ -1,6 +1,7 @@
 {
   "enrich.get_policy": {
     "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/enrich-get-policy.html",
+    "stability" : "stable",
     "methods": [ "GET" ],
     "url": {
       "path": "/_enrich/policy/{name}",

x-pack/plugin/src/test/resources/rest-api-spec/api/enrich.list_policy.json

@@ -1,6 +1,7 @@
 {
   "enrich.list_policy": {
     "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/enrich-list-policy.html",
+    "stability" : "stable",
     "methods": [ "GET" ],
     "url": {
       "path": "/_enrich/policy",

x-pack/plugin/src/test/resources/rest-api-spec/api/enrich.put_policy.json

@@ -1,6 +1,7 @@
 {
   "enrich.put_policy": {
     "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/enrich-put-policy.html",
+    "stability" : "stable",
     "methods": [ "PUT" ],
     "url": {
       "path": "/_enrich/policy/{name}",