resolved conflicts with main

Author: piergm

server/src/internalClusterTest/java/org/elasticsearch/search/fetch/subphase/highlight/HighlighterSearchIT.java

@@ -3769,5 +3769,4 @@ public Analyzer get() {
             });
         }
     }
-
 }

server/src/internalClusterTest/java/org/elasticsearch/search/fetch/subphase/highlight/constantkeyword/MockConstantFieldType.java

@@ -20,6 +20,7 @@
 import org.elasticsearch.index.mapper.ConstantFieldType;
 import org.elasticsearch.index.mapper.KeywordFieldMapper;
 import org.elasticsearch.index.mapper.ValueFetcher;
+import org.elasticsearch.index.query.QueryRewriteContext;
 import org.elasticsearch.index.query.SearchExecutionContext;
 
 import java.util.Map;
@@ -77,7 +78,7 @@ public TermsEnum getTerms(IndexReader reader, String prefix, boolean caseInsensi
     }
 
     @Override
-    protected boolean matches(String pattern, boolean caseInsensitive, SearchExecutionContext context) {
+    protected boolean matches(String pattern, boolean caseInsensitive, QueryRewriteContext context) {
         if (value == null) {
             return false;
         }