Fixes #4756: Fix default file header on upgrade
Merge pull request #303 from VinceMacBuche/bug_4757/default_header_on_upgrade

Fixes #4756: Fix default file header on upgrade
Merge branch 'branches/rudder/2.9' into branches/rudder/2.10
Fixes #4752: Check-rudder-agent does not clean cf_lock.tcdb
Merge pull request #305 from VinceMacBuche/bug_4752/missing_deleted_file

Fixes #4752: Check-rudder-agent does not clean cf_lock.tcdb
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