Fixes #5941: Synchronize rudder-agent with rudder-agent-thin
Merge pull request #559 from Kegeruneku/bug_5941/int/5941_synchronise_agent_with_agent_thin

Fixes #5941: Synchronize rudder-agent with rudder-agent-thin