TEIID-2563 TEIID-2527 pulling back better status check code from 8.5