Merge "Fix cert usages and Zookeeper namespace"