TEIID-2563 TEIID-2527 pulling back better status check code from 8.5
TEIID-2604 fix for error response
TEIID-2603 back-porting 8.5 breaking change
Merge branch '8.4.x' of https://github.com/teiid/teiid