Headmaster: bugfixes
Merge branch 'zookeeper' of https://github.com/esiqveland/voldemort into zookeeper