Fixes #5799: Correct syslog-ng configuration maintenance
Merge pull request #593 from Kegeruneku/bug_5799/int/5799_correct_syslog_ng_line_maintenance

Fixes #5799: Correct syslog-ng configuration maintenance
Fixes #5440: [motdConfiguration] REGEX constraint outside of CONSTRAINT block
Merge pull request #594 from peckpeck/bug_5440/motdconfiguration_regex_constraint_outside_of_constraint_block

Fixes #5440: [motdConfiguration] REGEX constraint outside of CONSTRAINT block
Merge branch 'branches/rudder/2.6' into branches/rudder/2.10
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11