Merge "[DMAAP-DR] Refactoring ssl csit suite"