fixup! Merge branch '7.x' into enrich-7.x

x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/TransportDeleteEnrichPolicyAction.java

@@ -40,7 +40,6 @@ public class TransportDeleteEnrichPolicyAction extends TransportMasterNodeAction
         return ThreadPool.Names.SAME;
     }
 
-    @Override
     protected AcknowledgedResponse newResponse() {
         throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
     }

x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/TransportExecuteEnrichPolicyAction.java

@@ -46,7 +46,6 @@ public class TransportExecuteEnrichPolicyAction
         return ThreadPool.Names.SAME;
     }
 
-    @Override
     protected AcknowledgedResponse newResponse() {
         throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
     }

x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/TransportGetEnrichPolicyAction.java

@@ -42,7 +42,6 @@ public class TransportGetEnrichPolicyAction extends TransportMasterNodeReadActio
         return ThreadPool.Names.SAME;
     }
 
-    @Override
     protected GetEnrichPolicyAction.Response newResponse() {
         throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
     }

x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/TransportListEnrichPolicyAction.java

@@ -47,7 +47,6 @@ public class TransportListEnrichPolicyAction
         return new ListEnrichPolicyAction.Response(in);
     }
 
-    @Override
     protected ListEnrichPolicyAction.Response newResponse() {
         throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
     }