Eng 5360 test

Add test for timeout at JDBC level. merge from master.