Merge "Removal of zookeeper from portal HELM charts"