TEIID-2444: temporary fix for failing testcases