TEIID-2890 fixing the use of duplicate group by expressions