JBTM-1355  Merge XTS JUnit and Arquillian tests (master)