Merge "DMAAP-Refactor CLM project block"