Merge "Fix registration of types for DMaaP Mediator"