Merge "Upgrade dmaap client"