Merge "Update to Setup and Testcases due to PM Mapper dmaap plugin feature"