TEIID-3183 preventing the logic from over altering the join order
Merge branch 'master' of https://github.com/teiid/teiid