Fixes #5379: Add a patch to correct empty files beeing created when templates are used with nolocks option in CFEngine
Merge pull request #457 from Kegeruneku/bug_5379/int/5379_correct_zero_sized_files_when_using_templates

Fixes #5379: Add a patch to correct empty files beeing created when temp...
Fixes #5380 - Remove whitespace in debian/contol file of rudder-agent
Merge pull request #458 from nperron/bug_5380/int/remove_white_space_in_control

Fixes #5380 - Remove whitespace in debian/contol file of rudder-agent
Merge branch 'branches/rudder/2.6' into branches/rudder/2.10
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11