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

Restores consolidation of nested batches.  Adds a separate mechanism for resuming a batch.

https://issues.jboss.org/browse/WFLY-3682