Merge branch 'branches/rudder/2.3'

* branches/rudder/2.3:
  Fix reporting for generic variable definition PT. Fixes #2416
  Fix a few typos. Refs #2297 #2415

Conflicts:
	techniques/fileDistribution/copyGitFile/1.3/metadata.xml
Merge branch 'branches/rudder/2.4' of github.com:Normation/rudder-techniques into branches/rudder/2.4
Merge branch 'branches/rudder/2.4'

* branches/rudder/2.4:
  Fixes #2391 Change behavior of deletion in fileManagement Policy Template/Technique
  Fixes #2416 : for a section to be a component, it needs to have component = true
  Fixes #1905: The remaining flawed report in openvpnClient has been eliminated
  Fixes #2442: The core-lib.st and library.st have been merged
  Refs #2435: TRIVIAL, Changed the copyright date on aptPackageManagerSettings
  Fixes #2435: Fixed the aptPackageManagerSettings PT (because of an unwanted SAMESIZEAS statement)
Merge branch 'branches/rudder/2.4'

* branches/rudder/2.4:
  Refs #2459 Adapt repository checking script to branch 2.4+
  Refs #2459 Change location of repository checking script and correct error handling for XML files
  Refs #2459 Change REPOSITOY_PATH to be a default value
  Refs #2459 Add absolute path for XML validator in the repository checking script
  Fixes #2459 Add a script for checking XML files and add use it in the repository checking script
  Fixes #2435: Deleted a useless comment in aptPackageManagerSettings PT
  Refs #2459 Add check-policies.sh which will be used to check that the repository is clean
Merge branch 'branches/rudder/2.4'

* branches/rudder/2.4:
  Refs #2465 Change path and policy references in order to be 2.4+ compliant
  Fixes #2454: The jobScheduler PT is now completely multivaluation compliant (reports and policy.xml adjusted)
  Fixes #2470: Added the binary comparison method in copyGitFile that was missing, and corrected the configuration statement description
  Fix reporting for post-hook in PT fileManagement. Fixes #2481
  Refs #2465: Added a MAYBEEMPTY var on checkGenericFileContent to make the file content part optionnal
  Fixes #2465: Adjusted checkGenericFileContent reports because of an extra report that should not be here
  Fixes #2467 : allowing to create a group and edit it in the same run
  Fixes #2465: The does not have a mandatory field to enforce file content anymore
  Fixes #2258: remove deprecated <MULTIVALUED> tag for inputs in common/policy.xml (cherry picked from commit fc82b4d725ce4e3fde4bfe9e7a017547460a046c)
  Fixes #2258: add missing section declaration around multivalued variables in common/policy.xml (cherry picked from commit 7f4a95fd1854cb27617c8d6887e7b09f7d5844a5)
  Fixes #2343 : correct the version of cfengine in the requierement (cherry picked from commit f5e924930e7a185d4536c7b434dd829fe2736766)
  Refs #2435 Change success report condition in aptPackageManagerSettings
  TRIVIAL: Adding comments on reporting in aptPackageManagerSettings
  Fixes #2467 : correct the reporting in the PT Group Management
Add --scan-homedirs option to FusionInventory agent. Fixes #2526
Merge branch 'branches/rudder/2.4'

* branches/rudder/2.4:
  Clean up old syslog-ng config lines when Rudder changes them. Fixes #2579
  Refs #2561 : adding the repository path for windows
  Fixes #2564: correct indentation for multi-line text
  Fixes #2562: correct the syntax of the DNS Policy Template on Windows system
  Fixes #2561 : correct Techniques for windows
  Fixes #2552 password will be defined only when user has to be updated, not checked
  Refs #2394 Change policy to technique (metadata.xml)
  Refs #2394 Change policy to technique
  Refs #2556 Change class names in order to avoid techniques collisions
  Refs #2555 change class names to avoid Techniques collisions
  Refs #2553 change class names to avoid Techniques collisions
  Refs #2553 Explain 'nos' class
  Fixes #2555 Enhance comments, varaiable names relevance and classes for reporting
  Fixes #2554 Correct CFEngine class to remove Windows users
  Fixes #2553 Add comments and change variables on User Management Technique
  Fixes #2077: The modified-files directory is now purged of every file older than 30 days
  Fixes #2394: The hosts management technique now enables the user to configure the base template for the hosts file in a new PT version
  Revert "Fixes #2394: The hosts management technique now enables the user to configure the base template for the hosts file"
  Fixes #2499 : use a proper name for the reports part
  Fixes #2499 : correct the parser to correctly handle winwdows reports
  Fixes #2498 : correct the time separator for windows reports
  Fixes #2498: correct the generated reports on Windows
  Fixes #2485: component name in reporting now matches the component name in policy.xml
Refs #860: Added a password checking promise to the distributePolicy, without WebDAV checking
Fixes #2587 : add webdav info as variables
Fixes #860: The password checking Technique is finally ready, yay !
Merge branch 'branches/rudder/2.4'

* branches/rudder/2.4:
  Followup to previous merge: move policies to techniques
  Fixes #2600 Correct description problem in Directive Management
  Fixes #2255: The Rudder distributePolicy now checks that the apache configuration is secure
  Refs #2303 : correct the binary path for the nova initial promises
  Fixes #2488: Enabled the user to use processManagement without specifying an argument to the command used
  Fixes #2457: Fixed the fileManagement PT: Delete files matching the desired age when the operation is 'this file or directory only'
  Fixes #2303: The initial promises for the root server were sync'ed with the regular Rudder technique tree
  Fixes #2561 : the windows path in the repository don't mix well with cfengine community

Conflicts:
	techniques/system/distributePolicy/1.0/metadata.xml
Merge branch 'branches/rudder/2.4'

* branches/rudder/2.4:
  Followup to previous merge, rename policy.xml to metadata.xml and contents too
Merge branch 'branches/rudder/2.4'

* branches/rudder/2.4:
  Refs #2600 Remove colon in section's description in Directive Management
Merge branch 'branches/rudder/2.4'

* branches/rudder/2.4:
  Add test for log level log_error. Fixes #2605
Merge branch 'branches/rudder/2.4'

* branches/rudder/2.4:
  s/log_error/result_error/ in apacheServer. Fixes #2606
Merge branch 'branches/rudder/2.4'

* branches/rudder/2.4:
  Revert "Fixes #2255: The Rudder distributePolicy now checks that the apache configuration is secure" Reverted: postponed to Rudder 2.5
Fixes #2255: The Rudder distributePolicy now checks that the apache configuration is secure
Upgrade cfengine_stdlib.cf. Fixes #2599
Fixes #2599 : removing body uncompatible with our version of CFEngine
Merge branch 'branches/rudder/2.4'

* branches/rudder/2.4:
  More initial promise sync'ing and cleanup for root server initial promises. Refs #2303
  Fixes #2599 : removing body uncompatible with our version of CFEngine
  Upgrade cfengine_stdlib.cf. Fixes #2599

Conflicts:
	techniques/system/distributePolicy/1.0/apacheCheck.st