Adding ZooKeeper and Clusterd services.
Merge branch 'master' into features/clustering