Merge branch 'branches/rudder/2.9' into branches/rudder/2.10

Conflicts:
	rudder-agent/SOURCES/check-rudder-agent
Fixes #4766: Adapt check-rudder-agent to agent frequency
Merge pull request #306 from VinceMacBuche/bug_4766/adapt_script_to_agent_executionx

Fixes #4766: Adapt check-rudder-agent to agent frequency
Merge branch 'branches/rudder/2.10'

Conflicts:
	rudder-agent/SOURCES/check-rudder-agent