Merge branch 'feature/SEARCH_1687_ContentStore_Removal' of git.alfresco.com:search_discovery/insightengine into feature/SEARCH_1687_ThreadScope_1

search-services/alfresco-search/src/main/resources/solr/instance/templates/noRerank/conf/solrconfig.xml

@@ -315,6 +315,10 @@
   <!-- The default high-performance update handler -->
   <updateHandler class="solr.DirectUpdateHandler2">
 
+      <updateLog>
+          <str name="dir">${solr.ulog.dir:}</str>
+      </updateLog>
+
     <!-- Enables a transaction log, used for real-time get, durability, and
          and solr cloud replica recovery.  The log can grow as big as
          uncommitted changes to the index, so use of a hard autoCommit

search-services/alfresco-search/src/main/resources/solr/instance/templates/rerank/conf/solrconfig.xml

@@ -321,7 +321,7 @@
          is recommended (see below).
          "dir" - the target directory for transaction logs, defaults to the
                 solr data directory.  -->
-    <updateLog enable="${enable.update.log:true}">
+    <updateLog enable="true">
       <str name="dir">${solr.ulog.dir:}</str>
     </updateLog>
 

search-services/alfresco-search/src/test/resources/test-files/collection1/conf/solrconfig.xml

@@ -84,7 +84,7 @@
         </listener>
         -->
 
-        <updateLog enable="${enable.update.log:true}">
+        <updateLog enable="true">
             <str name="dir">${solr.ulog.dir:}</str>
         </updateLog>
         <!--

search-services/alfresco-search/src/test/resources/test-files/master/conf/solrconfig.xml

@@ -84,7 +84,7 @@
         </listener>
         -->
 
-        <updateLog enable="${enable.update.log:true}">
+        <updateLog enable="true">
             <str name="dir">${solr.ulog.dir:}</str>
         </updateLog>
         <!--

search-services/alfresco-search/src/test/resources/test-files/slave/conf/solrconfig.xml

@@ -93,6 +93,10 @@
         </commitWithin>
         -->
 
+        <updateLog enable="true">
+            <str name="dir">${solr.ulog.dir:}</str>
+        </updateLog>
+
     </updateHandler>
 
     <query>