Remove dependency on zookeeper-start service
Merging in zookeeper-start fix