Merge "Fix SDNC DMaaP connectivity issues"