Fix up merge

Author: DaveCTurner

test/framework/src/main/java/org/elasticsearch/common/lucene/store/ESIndexInputTestCase.java

@@ -43,7 +43,7 @@ public class ESIndexInputTestCase extends ESTestCase {
     @BeforeClass
     public static void createExecutor() {
         final String name = getTestClass().getSimpleName() + "#randomReadAndSlice";
-        executor = EsExecutors.newFixed(name, 10, 0, EsExecutors.daemonThreadFactory(name), new ThreadContext(Settings.EMPTY));
+        executor = EsExecutors.newFixed(name, 10, 0, EsExecutors.daemonThreadFactory(name), new ThreadContext(Settings.EMPTY), false);
     }
 
     @AfterClass

x-pack/plugin/searchable-snapshots/src/test/java/org/elasticsearch/index/store/SearchableSnapshotDirectoryTests.java

@@ -32,6 +32,7 @@
 import org.apache.lucene.store.IOContext;
 import org.apache.lucene.store.IndexInput;
 import org.apache.lucene.util.BytesRef;
+import org.elasticsearch.Version;
 import org.elasticsearch.action.support.PlainActionFuture;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.cluster.metadata.RepositoryMetaData;
@@ -341,7 +342,8 @@ private void testDirectories(final CheckedBiConsumer<Directory, Directory, Excep
                 final PlainActionFuture<String> future = PlainActionFuture.newFuture();
                 threadPool.generic().submit(() -> {
                     IndexShardSnapshotStatus snapshotStatus = IndexShardSnapshotStatus.newInitializing(null);
-                    repository.snapshotShard(store, null, snapshotId, indexId, indexCommit, snapshotStatus, true, emptyMap(), future);
+                    repository.snapshotShard(store, null, snapshotId, indexId, indexCommit, snapshotStatus, Version.CURRENT, emptyMap(),
+                        future);
                     future.actionGet();
                 });
                 future.actionGet();