Update version 3.6.17-windows-splunk-v2

Update version string to splunk1

README-SPLUNK-WINDOWS

@@ -0,0 +1,32 @@
+Splunk Custom Build Windows
+===========================
+
+NOTE: We use 3 separate branches to build and test builds for Splunk:  Linux, Windows, and MacOS.
+
+This is because signficant changes have to be made to build the tools on RHEL 5.5 Linux.  We also need to make some code changes to account for features
+that are not available in the older OS.
+
+Finally, Splunk requires different versions of openssl (and a specific location requirement on macOS requiring its own distro in Evergreen) 
+This would be hard to generalize in a single evergreen.yml in one branch.
+
+Current branches:
+
+splunk-linux-v3.6.17-BACKPORT-6439
+splunk-macos-v3.6.17-BACKPORT-6439
+splunk-windows-v3.6.17-BACKPORT-6439
+
+Windows
+-------
+
+Splunk has been using the community releases of Windows and there isn't really anything we need to change for custom builds.
+
+In this case we changed the version number and made sure that the version we gave them included SERVER-42525
+
+When running a patch build, use this variant: `windows-64-2k8-ssl`
+
+ie. 
+
+```
+evergreen patch -p "mongodb-mongo-v3.6" -t "compile" -d "BUILD-10833 Splunk custom build of 3.6.17 with BACKPORT-6439 WINDOWS" -v "windows-64-2k8-ssl" -u -f
+```
+

etc/evergreen.yml

@@ -80,12 +80,15 @@ variables:
       set -o verbose
 
       # We get the raw version string (r1.2.3-45-gabcdef) from git
-      MONGO_VERSION=$(git describe)
+      ### SPLUNK
+      ### MONGO_VERSION=$(git describe)
+      MONGO_VERSION=3.6.17-windows-splunk-v2
       # If this is a patch build, we add the patch version id to the version string so we know
       # this build was a patch, and which evergreen task it came from
-      if [ "${is_patch|}" = "true" ]; then
-        MONGO_VERSION="$MONGO_VERSION-patch-${version_id}"
-      fi
+      ### SPLUNK
+      ### if [ "${is_patch|}" = "true" ]; then
+      ###  MONGO_VERSION="$MONGO_VERSION-patch-${version_id}"
+      ### fi
 
       # This script converts the generated version string into a sanitized version string for
       # use by scons and uploading artifacts as well as information about for the scons cache.
@@ -809,12 +812,15 @@ functions:
         set -o verbose
 
         # We get the raw version string (r1.2.3-45-gabcdef) from git
-        MONGO_VERSION=$(git describe)
+        ### SPLUNK
+        ### MONGO_VERSION=$(git describe)
+        MONGO_VERSION=3.6.17-windows-splunk-v2
         # If this is a patch build, we add the patch version id to the version string so we know
         # this build was a patch, and which evergreen task it came from
-        if [ "${is_patch|}" = "true" ]; then
-          MONGO_VERSION="$MONGO_VERSION-patch-${version_id}"
-        fi
+        ### SPLUNK
+        ### if [ "${is_patch|}" = "true" ]; then
+        ###  MONGO_VERSION="$MONGO_VERSION-patch-${version_id}"
+        ### fi
 
         # This script converts the generated version string into a sanitized version string for
         # use by scons and uploading artifacts as well as information about for the scons cache.
@@ -7056,8 +7062,9 @@ buildvariants:
   - name: ssl
   - name: sslSpecial
 
+### SPLUNK
 - name: windows-64-2k8-ssl
-  display_name: SSL Windows 2008R2
+  display_name: SSL Windows 2008R2 SPLUNK
   run_on:
   - windows-64-vs2015-small
   batchtime: 1440 # 1 day

src/mongo/db/storage/mmap_v1/dur_journal.cpp

@@ -262,7 +262,6 @@ void removeJournalFiles() {
         log() << "error removing journal files " << e.what() << endl;
         throw;
     }
-    verify(!haveJournalFiles());
 
     flushMyDirectory(getJournalDir() /
                      "file");  // flushes parent of argument (in this case journal dir)