tune zk connect and client timeouts
Merge remote-tracking branch 'upstream/master'
Merge pull request #69 from gsegura/master

tune zk connect and client timeouts