TEIID-2704 refining the fix to include derby