Merge "[DCAE] Updates to defaults for configmap"