DELTASPIKE-454 cleanup
DELTASPIKE-496 Merge arquillian.xml files into a single one