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
Merge pull request #366 from vhalbert/8.7.x

fixes for TEIID-3226 and part of TEIID-3185