Fixes #3913 : prevent rsyslog to drop patches
Merge pull request #182 from ncharles/bug_3913/dev/rsyslog_drops_message

Fixes #3913 : prevent rsyslog to drop patches
Fixes #3968: Correct a missing vars: entry in promises.st
Merge pull request #193 from Kegeruneku/bug_3968/dev/3968_fix_promises_st

Fixes #3968: Correct a missing vars: entry in promises.st
Merge branch 'branches/rudder/2.4' into branches/rudder/2.6

Conflicts:
	techniques/system/common/1.0/promises.st