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