Merge "Remove variable part of agent dict to fix AgentManagementTest"