Merge "[DMAAP] Refactoring dmaap suites"