Github user mjeelanimsft commented on the issue:
https://github.com/apache/zookeeper/pull/548
@anmolnar Resolved the merge conflict. You can see the commit with the unit
test changes here -
https://github.com/apache/zookeeper/pull/548/commits/ff4704984203921071877bdee4efef47b8c2a706---
