Fixes #5773: Syslog configuration on agent can conflict with loghosts
Merge pull request #558 from peckpeck/bug_5773/syslog_configuration_on_agent_can_conflict_with_loghosts

Fixes #5773: Syslog configuration on agent can conflict with loghosts
Refs #5755: copyGitFile: Create 1.7 from 1.6
Fixes #5755: copyGitFile/1.7 technique must have an option to allow purge of local directory content
Merge pull request #561 from peckpeck/ust_5754/dev/5755/Allow_to_set_purge_to_true

Ust 5754/dev/5755/allow to set purge to true
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11
Merge branch 'branches/rudder/2.11' into branches/rudder/3.0