Increased zookeeper timeout
Merge branch 'master' of github.com:NGDATA/lilyproject