Merge "Add support for dmaap and ueb for sdnc"