Correct fix for WFLY-3682 which caused regressions in XPC PassivationTestCase.  Restores consolidation of nested batches.  Adds separate mechanism for resuming a batch.
Add sleep following start/stop/deploy/undeploy to help address timing issues with failover tests.
Merge pull request #6560 from pferraro/ejb

Correct fix for WFLY-3682 which caused regressions in XPC PassivationTestCase