Merge "Refactor for better separation DMaaP Mediator"