Merge "Fix license issues in dmaap mr"