Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040046.sql
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040046.sql	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040046.sql	(revision 5df1910a9f20101bda67391d8622a60818b4a791)
@@ -0,0 +1,13 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+
+-- LDEV-3597 Remove SSL configuration as it is done differently in WildFly
+DELETE FROM lams_configuration WHERE config_key = 'TruststorePassword'
+                                  OR config_key = 'TruststorePath';
+
+-- If there were no errors, commit and restore autocommit to on
+SET FOREIGN_KEY_CHECKS=0;
+COMMIT;
+SET AUTOCOMMIT = 1;
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/util/Configuration.java
===================================================================
diff -u -rc208628989d52041b3765784f4c8cbfd6c80d47b -r5df1910a9f20101bda67391d8622a60818b4a791
--- lams_common/src/java/org/lamsfoundation/lams/util/Configuration.java	(.../Configuration.java)	(revision c208628989d52041b3765784f4c8cbfd6c80d47b)
+++ lams_common/src/java/org/lamsfoundation/lams/util/Configuration.java	(.../Configuration.java)	(revision 5df1910a9f20101bda67391d8622a60818b4a791)
@@ -126,14 +126,6 @@
 		Iterator<ConfigurationItem> itemIterator = itemList.iterator();
 		while (itemIterator.hasNext()) {
 		    ConfigurationItem item = itemIterator.next();
-
-		    // init ssl truststore path and password
-		    if (StringUtils.equals(item.getKey(), ConfigurationKeys.TRUSTSTORE_PATH)) {
-			Configuration.setSystemProperty(item.getKey(), item.getValue());
-		    } else if (StringUtils.equals(item.getKey(), ConfigurationKeys.TRUSTSTORE_PASSWORD)) {
-			Configuration.setSystemProperty(item.getKey(), item.getValue());
-		    }
-
 		    itemMap.put(item.getKey(), item);
 		}
 	    }
@@ -283,11 +275,6 @@
     }
 
     public void persistUpdate() {
-	// update ssl truststore path and password
-	Configuration.setSystemProperty(ConfigurationKeys.TRUSTSTORE_PATH,
-		Configuration.get(ConfigurationKeys.TRUSTSTORE_PATH));
-	Configuration.setSystemProperty(ConfigurationKeys.TRUSTSTORE_PASSWORD,
-		Configuration.get(ConfigurationKeys.TRUSTSTORE_PASSWORD));
 	updatePublicFolderName();
 	Configuration.configurationDAO.insertOrUpdateAll(Configuration.items.values());
     }
Index: lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
===================================================================
diff -u -ra939bcf145b0e4deab5838f87b047df5ca48c92d -r5df1910a9f20101bda67391d8622a60818b4a791
--- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java	(.../ConfigurationKeys.java)	(revision a939bcf145b0e4deab5838f87b047df5ca48c92d)
+++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java	(.../ConfigurationKeys.java)	(revision 5df1910a9f20101bda67391d8622a60818b4a791)
@@ -147,10 +147,6 @@
 
     public static String LDAP_SECURITY_PROTOCOL = "LDAPSecurityProtocol";
 
-    public static String TRUSTSTORE_PATH = "TruststorePath";
-
-    public static String TRUSTSTORE_PASSWORD = "TruststorePassword";
-
     public static String LDAP_LOGIN_ATTR = "LDAPLoginAttr";
 
     public static String LDAP_FIRST_NAME_ATTR = "LDAPFNameAttr";