Merge "Fix SDNC DMAAP consumer properties in HELM charts"