TEIID-2597 fixing when the connection timeout is set
Merge branch '8.4.x' of https://github.com/teiid/teiid