Remove timeout from zk
Merge pull request #369 from Juniper/rrugge_ocs1

Remove timeout from zk