Fixes #4360: correct patch that was not accepted
Merge pull request #207 from ncharles/bug_4360/dev/correct_detection_of_redhat2

Fixes #4360: correct patch that was not accepted
Fixes #4280: Correct the SLES apache include addition to apache2 sysconfig
Merge pull request #197 from Kegeruneku/bug_4280/int/4280_add_rudder_sysconfig_includes_in_all_cases

Fixes #4280: Correct the SLES apache include addition to apache2 sysconf...
Merge branch 'branches/rudder/2.4' into branches/rudder/2.6
Merge branch 'branches/rudder/2.6' into branches/rudder/2.7

Conflicts:
	rudder-webapp/SPECS/rudder-webapp.spec
Merge branch 'branches/rudder/2.7' into branches/rudder/2.8