Index: lams_build/build.xml
===================================================================
diff -u -r588fe01186ff8c7c5b215e15f5ac4763137e0284 -rde10989b7e9fc4b49ef4061b019be99ab32a51da
--- lams_build/build.xml	(.../build.xml)	(revision 588fe01186ff8c7c5b215e15f5ac4763137e0284)
+++ lams_build/build.xml	(.../build.xml)	(revision de10989b7e9fc4b49ef4061b019be99ab32a51da)
@@ -730,6 +730,15 @@
 	        </filterset>
 		</copy>
 		
+		<!-- DELETE org/wildfly/clustering/web/undertow module. This module is used by default
+		 (no reconfiguration possible) by Wildfly shared-session (LAMS SSO) to store web sessions as
+		 DistributableSessions with Infinispan cache. When this module is not present - InMemorySessionManager
+		 is used instead. DistributableSessions for shared-session are buggy under wildfly 8.2.0, we don't
+		 use them till migration to Wildfly 9.x -->
+		<delete >
+			<fileset dir="${server.home}/modules/system/layers/base/org/wildfly/clustering/web/undertow" />
+		</delete>
+		
 		<!-- Mark EAR for WildFly deployment -->
 		<delete >
 			<fileset dir="${server.home}/standalone/deployments" includes="lams.ear.*"/>
Index: lams_build/conf/standalone.xml
===================================================================
diff -u -rf2dcf163cc2c619cd1a4a56d7242d8226be771aa -rde10989b7e9fc4b49ef4061b019be99ab32a51da
--- lams_build/conf/standalone.xml	(.../standalone.xml)	(revision f2dcf163cc2c619cd1a4a56d7242d8226be771aa)
+++ lams_build/conf/standalone.xml	(.../standalone.xml)	(revision de10989b7e9fc4b49ef4061b019be99ab32a51da)
@@ -326,15 +326,11 @@
                 <local-cache name="default" />
             </cache-container>
             <cache-container name="web" default-cache="passivation" module="org.wildfly.clustering.web.infinispan">
-                <local-cache name="passivation">
-                    <transaction mode="NON_XA" locking="OPTIMISTIC"/>
-                    <locking isolation="READ_COMMITTED"/>
-                    <!-- <file-store passivation="true" purge="false"/> -->
+                <local-cache name="passivation" batching="true">
+                    <file-store passivation="true" purge="false"/>
                 </local-cache>
-                <local-cache name="persistent">
-                    <transaction mode="NON_XA" locking="OPTIMISTIC"/>
-                    <locking isolation="READ_COMMITTED"/>
-                    <!-- <file-store passivation="false" purge="false"/> -->
+                <local-cache name="persistent" batching="true">
+                    <file-store passivation="false" purge="false"/>
                 </local-cache>
             </cache-container>
             <cache-container name="hibernate" default-cache="local-query" module="org.hibernate" start="EAGER">