Fixes #3069 : correct the version 3.0 of the check generic file content based on the modification applied on version 3.1
Refs #3069 : complete the check for content to add in the promises
Refs #2887: Add a warning in the checkGenericFileContent Technique about content escaping in the file payload
Refs #2887: Add a warning in the checkGenericFileContent Technique about content escaping in the file payload ( s/Technique/Policy Template/ )
Fixes #3131: The fileManagement Policy Template/Technique reporting has been corrected in case of a 'do nothing' action
Fixes #3141: Finished the SUID/SGID compliant version of the filePermissions PT/Technique
Merge branch 'branches/rudder/2.3' into branches/rudder/2.4

* branches/rudder/2.3:
  Fixes #3131: The fileManagement Policy Template/Technique reporting has been corrected in case of a 'do nothing' action
  Refs #2887: Add a warning in the checkGenericFileContent Technique about content escaping in the file payload ( s/Technique/Policy Template/ )
  Refs #2887: Add a warning in the checkGenericFileContent Technique about content escaping in the file payload

Conflicts:
	techniques/fileDistribution/checkGenericFileContent/1.0/metadata.xml
	techniques/fileDistribution/checkGenericFileContent/2.0/metadata.xml
	techniques/fileDistribution/checkGenericFileContent/2.1/metadata.xml
	techniques/fileDistribution/checkGenericFileContent/3.0/metadata.xml
	techniques/fileDistribution/checkGenericFileContent/3.1/metadata.xml
Refs #2887 - Fix an wrong merge from branch 2.4 to 2.3
Fixes #2794 : add reports on non debian system pour package management for debian
Fixes #2545 : correct the description about compatibility of Apache2
Merge pull request #31 from ncharles/bug_2545/dev/apache_compatibility

Fixes #2545 : correct the description about compatibility of Apache2
Merge branch 'branches/rudder/2.3' into branches/rudder/2.4

* branches/rudder/2.3:
  Fixes #2545 : correct the description about compatibility of Apache2
Fixes #3148: Added versions support to the apt and rpm installation Policy Templates
Fixes #3148: Added updated version support to the apt and rpm installation Policy Templates
Refs #3148: cleanup changes
Refs #3141: fix class usage and cleanup
Refs #3141: only use the protective class when necessary
Merge pull request #39 from jooooooon/ust_3115/dev/3141_suid_sgid_handling_in_file_permissions_technique_JCL

Ust 3115/dev/3141 suid sgid handling in file permissions technique jcl
Merge pull request #37 from jooooooon/ust_3147/dev/3148_package_version_handling_in_rpmPackageInstallation_technique_JCL

Fixes #3148: Added versions support to the apt and rpm installation Policy Templates
Merge pull request #30 from ncharles/bug_2794/dev/add_report_on_non_debian_system

Fixes #2794 : add reports on non debian system pour package management f...