(cherry picked from commit 30afa2a1353394c1287f378b1cbc215dfc385374) Conflicts: pandora_agents/win32/bin/pandora_agent.conf