Merge "[DMAAP-MR] Remediate log4j bug"