Merge "Fix DCAE VES Collector csits for latest schema mapping changes"