Merge pull request #6560 from pferraro/ejb

Correct fix for WFLY-3682 which caused regressions in XPC PassivationTestCase
Add topology stabilization logic to tests that are timing sensitive to topology changes.