Merge "[DMAAP-DR-PROV] Remove aaf & cadi"