Merge "[Champ] Update to use DMaaP with SSL"