TEIID-2482 allowing the planner more flexibility