Merge pull request #79 from sohaniwso2/sohani370b

Fixing Tools 2492
Fixing TOOLS-2493 - Call Mediator can only have one endpoint