Merge "Remove using of DMAAP client from ONAP"