Fixes #5099: remove incompatible rsyslog conditional with CFEngine 3.6
Merge pull request #419 from ncharles/bug_5099/int/remove_incorrect_rsyslog_condition

Fixes #5099: remove incompatible rsyslog conditional with CFEngine 3.6
Merge branch 'branches/rudder/2.6' into branches/rudder/2.9
Merging 2.6 into 2.9, refs #5099
Merging 2.9 -> 2.10 Refs #5099