Merge "Disabling http ports on DMaaP"