Fixed sam-agent and locator-client for TESB-9287 (TESB-10959)