Merge "Fix make of multicloud helm chart"