Merge "Helm changes for new Kafka and zk images"