Merge "[DMAAP-DR] Fix java 17 job"