update ZooKeeper version used in Travis test from 3.4.5 to 3.4.6 (fix #857)
Merge remote-tracking branch 'upstream/master' into develop