Fixing TOOLS-2471 - Entitlement Mediator Property issues