TEIID-2721 fix for using the wrong columns
Merge branch '8.4.x' of https://github.com/teiid/teiid into 8.4.x