Merge pull request #16 from Kegeruneku/bug_3104/dev/3104_fix_the_suse_generic_package_installation_promise

Fixes #3104: Fixed the SuSE generic package installation method
Merge branch 'branches/rudder/2.4' into branches/rudder/2.4.1

* branches/rudder/2.4:
  Fixes #3104 : correct the ssh installation on SuSE
  Fixes #3107 : remove invalid value from the syslog_ng conf file
  Refs #3107 : correct the configuration for syslog-ng system
Fixes #3016 - Change use of body class cf2_if_else by if_else in order to thrown class when promises kept
Fix #3113 - Add new version of Manage files and folder in order to be able to force creation of symlinks
Merge pull request #20 from nperron/bug_3106/dev/fix_propagatePromises_reports

Fixes #3016 - Change use of body class cf2_if_else by if_else in order to thrown class when promises kept
Refs #3113 - Change description of enforcing the symlink creation
Merge pull request #21 from nperron/bug_3113/dev/permit_to_force_symlinks_creation

Fix #3113 - Add new version of Manage files and folder in order to be able to force creation of symlinks
Refs #3106: corrects reports in initial promises for distribute policy
Merge pull request #22 from ncharles/bug_3106/dev/fix_propagatePromises_reports

Refs #3106: corrects reports in initial promises for distribute policy
Merge branch 'branches/rudder/2.3' into branches/rudder/2.4

* branches/rudder/2.3:
  Refs #3113 - Change description of enforcing the symlink creation
  Fix #3113 - Add new version of Manage files and folder in order to be able to force creation of symlinks
Refs #3113 - End of merge from branch 2.3 to 2.4 for Technique 'Manage files and folders' v1.1
Fixes #3044 Fixes #3062: correct the module installation and reporting on the technique apache2 installation
Merge pull request #11 from ncharles/bug3062/dev/correct_module_install_and_reporting_3062_3044

Fixes #3044 Fixes #3062: correct the module installation and reporting on the technique apache2 installation
Merge branch 'branches/rudder/2.3' into branches/rudder/2.4
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
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
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