Merge "BUG-1541 Make EXI and clientConnectTimeout configurable in testtool."