conflict resolved
improve JMS tests
tests with EAP 6.3.1