Merge "Reverting http DMaaP port change"