Merge "[DMAAP-MR] Fix vulnerabilities for rel I"