Merge "Get rid of zookeeper from devstack"