Fixing TOOLS-2472 - Entitlement Deserializing issue fixed