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