Use timeout in CountdownLatch

Hi, without this change my calls to connect hang indefinitely. I have just passed the timeout-ms to the countdown latch await call.

I'm not really sure using the same val for the timeoutLatch and the zk client timeout is the right approach - happy to discuss.

Cheers