Merge "[DMAAP] Use common aaf template in dmaap-dr-prov" into frankfurt