TEIID-2633 ensuring only the most limited use of discovered join
criteria
TEIID-2633 ensuring optional flag won't be set