Fix 7.x backport compilation issues

Author: williamrandolph

client/rest-high-level/src/test/java/org/elasticsearch/client/FeaturesIT.java

@@ -44,7 +44,7 @@ public void testResetFeatures() throws IOException {
         RestHighLevelClient adminHighLevelClient = new RestHighLevelClient(
             adminClient(),
             (client) -> {},
-            new SearchModule(Settings.EMPTY, Collections.emptyList()).getNamedXContents());
+            new SearchModule(Settings.EMPTY, true, Collections.emptyList()).getNamedXContents());
         ResetFeaturesResponse response = execute(request,
             adminHighLevelClient.features()::resetFeatures,
             adminHighLevelClient.features()::resetFeaturesAsync);

server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestResetFeatureStateAction.java

@@ -45,7 +45,7 @@ protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient cli
         return restChannel -> client.execute(
             ResetFeatureStateAction.INSTANCE,
             req,
-            new RestToXContentListener<>(restChannel) {
+            new RestToXContentListener<ResetFeatureStateResponse>(restChannel) {
                 @Override
                 protected RestStatus getStatus(ResetFeatureStateResponse response) {
                     long failures = response.getFeatureStateResetStatuses().stream()