diff --git a/search-services/alfresco-search/src/main/resources/solr/instance/templates/noRerank/conf/solrcore.properties b/search-services/alfresco-search/src/main/resources/solr/instance/templates/noRerank/conf/solrcore.properties
index 15058b2e1..23b1f8408 100644
--- a/search-services/alfresco-search/src/main/resources/solr/instance/templates/noRerank/conf/solrcore.properties
+++ b/search-services/alfresco-search/src/main/resources/solr/instance/templates/noRerank/conf/solrcore.properties
@@ -43,11 +43,11 @@ alfresco.secureComms=https
 alfresco.encryption.ssl.keystore.type=JCEKS
 alfresco.encryption.ssl.keystore.provider=
 alfresco.encryption.ssl.keystore.location=ssl.repo.client.keystore
-alfresco.encryption.ssl.keystore.passwordFileLocation=ssl-keystore-passwords.properties
+alfresco.encryption.ssl.keystore.passwordFileLocation=
 alfresco.encryption.ssl.truststore.type=JCEKS
 alfresco.encryption.ssl.truststore.provider=
 alfresco.encryption.ssl.truststore.location=ssl.repo.client.truststore
-alfresco.encryption.ssl.truststore.passwordFileLocation=ssl-truststore-passwords.properties
+alfresco.encryption.ssl.truststore.passwordFileLocation=
 
 # Default Tracker
 alfresco.cron=0/10 * * * * ? *
diff --git a/search-services/alfresco-search/src/main/resources/solr/instance/templates/rerank/conf/solrcore.properties b/search-services/alfresco-search/src/main/resources/solr/instance/templates/rerank/conf/solrcore.properties
index 8cebb969b..447c4eec2 100644
--- a/search-services/alfresco-search/src/main/resources/solr/instance/templates/rerank/conf/solrcore.properties
+++ b/search-services/alfresco-search/src/main/resources/solr/instance/templates/rerank/conf/solrcore.properties
@@ -43,11 +43,11 @@ alfresco.secureComms=https
 alfresco.encryption.ssl.keystore.type=JCEKS
 alfresco.encryption.ssl.keystore.provider=
 alfresco.encryption.ssl.keystore.location=ssl.repo.client.keystore
-alfresco.encryption.ssl.keystore.passwordFileLocation=ssl-keystore-passwords.properties
+alfresco.encryption.ssl.keystore.passwordFileLocation=
 alfresco.encryption.ssl.truststore.type=JCEKS
 alfresco.encryption.ssl.truststore.provider=
 alfresco.encryption.ssl.truststore.location=ssl.repo.client.truststore
-alfresco.encryption.ssl.truststore.passwordFileLocation=ssl-truststore-passwords.properties
+alfresco.encryption.ssl.truststore.passwordFileLocation=
 
 # Default Tracker
 alfresco.cron=0/10 * * * * ? *
diff --git a/search-services/alfresco-search/src/test/resources/test-files/collection1/conf/solrcore.properties b/search-services/alfresco-search/src/test/resources/test-files/collection1/conf/solrcore.properties
index aa07843d0..bedcbe554 100644
--- a/search-services/alfresco-search/src/test/resources/test-files/collection1/conf/solrcore.properties
+++ b/search-services/alfresco-search/src/test/resources/test-files/collection1/conf/solrcore.properties
@@ -39,11 +39,11 @@ alfresco.secureComms=none
 alfresco.encryption.ssl.keystore.type=JCEKS
 alfresco.encryption.ssl.keystore.provider=
 alfresco.encryption.ssl.keystore.location=ssl.repo.client.keystore
-alfresco.encryption.ssl.keystore.passwordFileLocation=ssl-keystore-passwords.properties
+alfresco.encryption.ssl.keystore.passwordFileLocation=
 alfresco.encryption.ssl.truststore.type=JCEKS
 alfresco.encryption.ssl.truststore.provider=
 alfresco.encryption.ssl.truststore.location=ssl.repo.client.truststore
-alfresco.encryption.ssl.truststore.passwordFileLocation=ssl-truststore-passwords.properties
+alfresco.encryption.ssl.truststore.passwordFileLocation=
 
 # Tracking
 
diff --git a/search-services/alfresco-search/src/test/resources/test-files/master/conf/solrcore.properties b/search-services/alfresco-search/src/test/resources/test-files/master/conf/solrcore.properties
index aa07843d0..bedcbe554 100644
--- a/search-services/alfresco-search/src/test/resources/test-files/master/conf/solrcore.properties
+++ b/search-services/alfresco-search/src/test/resources/test-files/master/conf/solrcore.properties
@@ -39,11 +39,11 @@ alfresco.secureComms=none
 alfresco.encryption.ssl.keystore.type=JCEKS
 alfresco.encryption.ssl.keystore.provider=
 alfresco.encryption.ssl.keystore.location=ssl.repo.client.keystore
-alfresco.encryption.ssl.keystore.passwordFileLocation=ssl-keystore-passwords.properties
+alfresco.encryption.ssl.keystore.passwordFileLocation=
 alfresco.encryption.ssl.truststore.type=JCEKS
 alfresco.encryption.ssl.truststore.provider=
 alfresco.encryption.ssl.truststore.location=ssl.repo.client.truststore
-alfresco.encryption.ssl.truststore.passwordFileLocation=ssl-truststore-passwords.properties
+alfresco.encryption.ssl.truststore.passwordFileLocation=
 
 # Tracking
 
diff --git a/search-services/alfresco-solrclient-lib/pom.xml b/search-services/alfresco-solrclient-lib/pom.xml
index 93e7d0695..241d24720 100644
--- a/search-services/alfresco-solrclient-lib/pom.xml
+++ b/search-services/alfresco-solrclient-lib/pom.xml
@@ -22,7 +22,7 @@
     </distributionManagement>
 
     <properties>
-        <dependency.alfresco-data-model.version>8.112</dependency.alfresco-data-model.version>
+        <dependency.alfresco-data-model.version>8.117</dependency.alfresco-data-model.version>
         <dependency.jackson.version>2.10.3</dependency.jackson.version>
     </properties>
 
diff --git a/search-services/alfresco-solrclient-lib/src/main/java/org/alfresco/solr/client/SOLRAPIClientFactory.java b/search-services/alfresco-solrclient-lib/src/main/java/org/alfresco/solr/client/SOLRAPIClientFactory.java
index 122c01c53..4db063ae4 100644
--- a/search-services/alfresco-solrclient-lib/src/main/java/org/alfresco/solr/client/SOLRAPIClientFactory.java
+++ b/search-services/alfresco-solrclient-lib/src/main/java/org/alfresco/solr/client/SOLRAPIClientFactory.java
@@ -131,11 +131,10 @@ public class SOLRAPIClientFactory
      * @param namespaceDAO allows retrieving and creating Namespace definitions
      * @return an instance of SOLRAPIClient
      */
-    public SOLRAPIClient getSOLRAPIClient(Properties props, KeyResourceLoader keyResourceLoader,
-                DictionaryService dictionaryService, NamespaceDAO namespaceDAO)
+    public SOLRAPIClient getSOLRAPIClient(Properties props, KeyResourceLoader keyResourceLoader, DictionaryService dictionaryService, NamespaceDAO namespaceDAO)
     {
 
-        if(Boolean.parseBoolean(System.getProperty("alfresco.test", "false")))
+        if (Boolean.parseBoolean(System.getProperty("alfresco.test", "false")))
         {
             return new SOLRAPIQueueClient(namespaceDAO);
         }
@@ -153,20 +152,18 @@ public class SOLRAPIClientFactory
             secureCommsType = props.getProperty("alfresco.secureComms", "none");
             if (secureCommsType.equals("https"))
             {
-	            sslKeyStoreType = getProperty(props, "alfresco.encryption.ssl.keystore.type", "JCEKS");
-	            sslKeyStoreProvider = getProperty(props, "alfresco.encryption.ssl.keystore.provider", "");
-	            sslKeyStoreLocation = getProperty(props, "alfresco.encryption.ssl.keystore.location",
-	                        "ssl.repo.client.keystore");
-	            sslKeyStorePasswordFileLocation = getProperty(props, 
-	                        "alfresco.encryption.ssl.keystore.passwordFileLocation", 
-	                        "ssl-keystore-passwords.properties");
-	            sslTrustStoreType = getProperty(props, "alfresco.encryption.ssl.truststore.type", "JCEKS");
-	            sslTrustStoreProvider = getProperty(props, "alfresco.encryption.ssl.truststore.provider", "");
-	            sslTrustStoreLocation = getProperty(props, "alfresco.encryption.ssl.truststore.location",
-	                        "ssl.repo.client.truststore");
-	            sslTrustStorePasswordFileLocation = getProperty(props, 
-	                        "alfresco.encryption.ssl.truststore.passwordFileLocation",
-	                        "ssl-truststore-passwords.properties");
+                sslKeyStoreType = getProperty(props, "alfresco.encryption.ssl.keystore.type", "JCEKS");
+                sslKeyStoreProvider = getProperty(props, "alfresco.encryption.ssl.keystore.provider", "");
+                sslKeyStoreLocation = getProperty(props, "alfresco.encryption.ssl.keystore.location",
+                        "ssl.repo.client.keystore");
+                sslKeyStorePasswordFileLocation = getProperty(props,
+                        "alfresco.encryption.ssl.keystore.passwordFileLocation", "");
+                sslTrustStoreType = getProperty(props, "alfresco.encryption.ssl.truststore.type", "JCEKS");
+                sslTrustStoreProvider = getProperty(props, "alfresco.encryption.ssl.truststore.provider", "");
+                sslTrustStoreLocation = getProperty(props, "alfresco.encryption.ssl.truststore.location",
+                        "ssl.repo.client.truststore");
+                sslTrustStorePasswordFileLocation = getProperty(props,
+                        "alfresco.encryption.ssl.truststore.passwordFileLocation", "");
             }
             maxTotalConnections = Integer.parseInt(props.getProperty("alfresco.maxTotalConnections", "40"));
             maxHostConnections = Integer.parseInt(props.getProperty("alfresco.maxHostConnections", "40"));
@@ -178,28 +175,29 @@ public class SOLRAPIClientFactory
 
         return client;
     }
-
+    
     protected AlfrescoHttpClient getRepoClient(KeyResourceLoader keyResourceLoader)
     {
-    	HttpClientFactory httpClientFactory = null;
-    	
-    	if (secureCommsType.equals("https"))
-    	{  
-	        KeyStoreParameters keyStoreParameters = new KeyStoreParameters("SSL Key Store", sslKeyStoreType,
-	                    sslKeyStoreProvider, sslKeyStorePasswordFileLocation, sslKeyStoreLocation);
-	        KeyStoreParameters trustStoreParameters = new KeyStoreParameters("SSL Trust Store", sslTrustStoreType,
-	                    sslTrustStoreProvider, sslTrustStorePasswordFileLocation, sslTrustStoreLocation);
-	        SSLEncryptionParameters sslEncryptionParameters = new SSLEncryptionParameters(keyStoreParameters,
-	                    trustStoreParameters);
-	        httpClientFactory = new HttpClientFactory(SecureCommsType.getType(secureCommsType),
-                    sslEncryptionParameters, keyResourceLoader, null, null, alfrescoHost, alfrescoPort,
-                    alfrescoPortSSL, maxTotalConnections, maxHostConnections, socketTimeout);
-    	}
-    	else
-    	{
-    		httpClientFactory = new PlainHttpClientFactory(alfrescoHost, alfrescoPort, maxTotalConnections, maxHostConnections);
-    	}
-    	
+        HttpClientFactory httpClientFactory = null;
+
+        if (secureCommsType.equals("https"))
+        {
+            KeyStoreParameters keyStoreParameters = new KeyStoreParameters("ssl-keystore", "SSL Key Store",
+                    sslKeyStoreType, sslKeyStoreProvider, sslKeyStorePasswordFileLocation, sslKeyStoreLocation);
+            KeyStoreParameters trustStoreParameters = new KeyStoreParameters("ssl-truststore", "SSL Trust Store",
+                    sslTrustStoreType, sslTrustStoreProvider, sslTrustStorePasswordFileLocation, sslTrustStoreLocation);
+            SSLEncryptionParameters sslEncryptionParameters = new SSLEncryptionParameters(keyStoreParameters,
+                    trustStoreParameters);
+            httpClientFactory = new HttpClientFactory(SecureCommsType.getType(secureCommsType), sslEncryptionParameters,
+                    keyResourceLoader, null, null, alfrescoHost, alfrescoPort, alfrescoPortSSL, maxTotalConnections,
+                    maxHostConnections, socketTimeout);
+        }
+        else
+        {
+            httpClientFactory = new PlainHttpClientFactory(alfrescoHost, alfrescoPort, maxTotalConnections,
+                    maxHostConnections);
+        }
+
         AlfrescoHttpClient repoClient = httpClientFactory.getRepoClient(alfrescoHost, alfrescoPortSSL);
         repoClient.setBaseUrl(baseUrl);
         return repoClient;