[teiid-dev] JCA merge