Merge "[DCAE] Log4j vulnerability fix"