Merge pull request #2 from markhamstra/master-csd

Catching up with Apache and reverting the Zookeeper version