TEIID-3237 ensuring that we prefer non-cross join plans