Merge "Dmaap Publisher base code"