TEIID-2697 changes to allow arquillian tests