[zookeeper] Fix borked rebase