Merge pull request #362 from vhalbert/8.7.x

TEIID-3170 needed the rest of the spring framework jars
TEIID-3222 fix to correct join modification
add TEIID-3219 reproduce test code
TEIID-3219: Excel Translator Wrong Result From Columns With Interleaved Null Values
TEIID-3228: Fixing the Timestamp and Date string parsing in the SOLR queries for incorrect evaluation day
Merge pull request #364 from rareddy/TEIID-3228-8.7.x

TEIID-3228: Fixing the Timestamp and Date string parsing in the SOLR que...
TEIID-3229 fix for inappropriate pushdown
Conflicts:
	engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleAssignOutputElements.java
	engine/src/test/java/org/teiid/query/processor/TestFunctionPushdown.java
fixes for TEIID-3226 to upgrade springframewor to 3.2.12 and part of TEIID-3185 which changed to use javax.ws.rs 2.0 jar version