TEIID-2968 fixing issue with non-partitioned aggregate handling