TEIID-2733 retaining optional join predicates in dependent join
scenarios
Conflicts:

	engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java
Merge branch '8.4.x' of https://github.com/teiid/teiid into 8.4.x