Make sure these tests close their InitialContext.
Add Batch context to StatefulSessionComponentInstance instead of thread local.  Otherwise Cache.release/discard(...) won't work if called from different thread than Cache.get(...).

Conflicts:
	ejb3/src/main/java/org/jboss/as/ejb3/cache/Contextual.java
	ejb3/src/main/java/org/jboss/as/ejb3/logging/EjbLogger.java
Remove dependency on Infinispan's BatchContainer which relies on ThreadLocals.

Conflicts:
	clustering/ejb/infinispan/src/main/java/org/wildfly/clustering/ejb/infinispan/InfinispanBeanManager.java
Fix NPE in InfinispanBeanEntryExternalizer.writeObject(...) when the lastAccessedTime is null (which is the case following creation).
Rename Contextual.get/setContext() to get/setCacheContext().
Merge pull request #6543 from pferraro/ejb-8.x

[8.x] Backport WFLY-3682 fix to 8.x
update UEL version
[WFLY-3348] Avoid spurious failures
[WFLY-3348] Close the input stream from domain deployment content additions

Conflicts:
	host-controller/src/main/java/org/jboss/as/domain/controller/operations/deployment/DeploymentUploadUtil.java
Merge pull request #6566 from bstansberry/WFLY-3348_8x

[WFLY-3348] Close the input stream from domain deployment content additions
WFLY-3695 Distributed web session expiration ScheduledExecutorService leaks threads on undeploy

Conflicts:
	clustering/ejb/infinispan/src/main/java/org/wildfly/clustering/ejb/infinispan/BeanExpirationScheduler.java
	clustering/ejb/infinispan/src/main/java/org/wildfly/clustering/ejb/infinispan/logging/InfinispanEjbLogger.java
	clustering/web/infinispan/src/main/java/org/wildfly/clustering/web/infinispan/logging/InfinispanWebLogger.java
	clustering/web/infinispan/src/main/java/org/wildfly/clustering/web/infinispan/session/SessionExpirationScheduler.java
Correct fix for WFLY-3682 which caused regressions in XPC PassivationTestCase.  Restores consolidation of nested batches.  Adds separate mechanism for resuming a batch.

Conflicts:
	clustering/ejb/infinispan/src/main/java/org/wildfly/clustering/ejb/infinispan/BeanEvictionContext.java
	clustering/ejb/infinispan/src/main/java/org/wildfly/clustering/ejb/infinispan/BeanEvictionScheduler.java
	clustering/ejb/infinispan/src/main/java/org/wildfly/clustering/ejb/infinispan/InfinispanBeanManager.java
	ejb3/src/main/java/org/jboss/as/ejb3/cache/distributable/DistributableCache.java
	ejb3/src/main/java/org/jboss/as/ejb3/cache/distributable/DistributableCacheFactoryService.java
Add sleep following start/stop/deploy/undeploy to help address timing issues with failover tests.
Add topology stabilization logic to tests that are timing sensitive to topology changes.

Conflicts:
	testsuite/integration/clust/src/test/java/org/jboss/as/test/clustering/cluster/session/persistence/SessionClusterDbPersistenceTestCase.java
	testsuite/integration/clust/src/test/java/org/jboss/as/test/clustering/cluster/web/CoarseWebFailoverTestCase.java
	testsuite/integration/clust/src/test/java/org/jboss/as/test/clustering/cluster/web/GranularWebFailoverTestCase.java
	testsuite/integration/clust/src/test/java/org/jboss/as/test/clustering/cluster/web/ReplicationForNegotiationAuthenticatorTestCase.java
WFLY-3702 RetryInvoker needs to be aware of transaction status
Ultimately fix WFLY-3401 EJB StatefulTimeoutTestCase transient failures.
If expiration task fires promptly, then now - lastAccessedTime == timeout
So make sure expiration check is inclusive.
Ultimately fix WFLY-3401 EJB StatefulTimeoutTestCase transient failures.
If expiration task fires promptly, then now - lastAccessedTime == timeout
So make sure expiration check is inclusive.
WFLY-3709 Ugrading Hibernate Validator to 5.1.2.Final
Merge pull request #6559 from codylerum/uel_update

[8.x] update UEL version
Merge pull request #6569 from pferraro/ejb-8.x

[8.x] Backport clustering fixes from master