Fixes #2363: Added the migrationeventlog 2.3-2.4 migration script to the rudder-webapp package
Merge branch 'master' of github.com:Normation/rudder-packages
Merge branch 'branches/rudder/2.3'

* branches/rudder/2.3:
  Fixes #2475 Add normation mirror for downloading CPAN resources
  Refs #2345 Typo on /var/rudder/cfengine-community path (cherry picked from commit 6c3710310f093b7c1284b5d0ef8a0d4e27ae0475)
  Fixes #2345 rudder-init.sh doesn't ask for resetting initial promises at the first install anymore (cherry picked from commit 2741a5f521d2a4d52749b177c4113e6662aef421)
  Fixes #2291: The packaging of rudder-inventory-endpoint has been fixed (inventory-web.properties path has been hardcoded) (cherry picked from commit cdd0838b1a5465e0d903a7d87d9cddf24df71ad7)
  Fixes #2269 inventory-web.properties is now considered as a config file (cherry picked from commit d55b3b0ca1222a1911cf1a50f849fd9764265809)
  Fixes #2455 change dmidecode dependencies for pmtools for SLES on rudder-agent package

Conflicts:
	rudder-agent/SOURCES/Makefile
	rudder-server-root/SOURCES/rudder-init.sh
Merge branch 'branches/rudder/2.4'

* branches/rudder/2.4:
  Refs #2475 typo on perl file name
  Fixes #2363: Added the migrationeventlog 2.3-2.4 migration script to the rudder-webapp package
  Refs #2345 Typo on /var/rudder/cfengine-community path

Conflicts:
	rudder-agent/SOURCES/Makefile
Merge branch 'branches/rudder/2.4'

* branches/rudder/2.4:
  Fixes #2273 Change download URL for FusionInventory Agent
  Fixes #2364: the fileFormat migration script has been integrated in the rudder-upgrade script
  Fixes #2489: The dbMigration-2.3-2.4-add-EventLog-reason-column.sql script to add the reason column to the eventlog table during upgrade has been integrated in the rudder 2.4 upgrade script
  Fixes #2405 Change JAVA path to ensure to use the good java binary
  Revert "Refs #2405 Create two default files for jetty. One for Debian, the other one for RPM in order to stop patching with rpmbuild"
  Fixes #2442: The rudder-upgrade script has been adapted to consider rudder_lib.st during update (fix)
  Fixes #2442: The rudder-upgrade script has been adapted to consider rudder_lib.st during update
  Refs #2422 Add more precise LDAP test for migration in rudder-upgrade.sh
Fixes #2520 CFEngine has been updated from 3.2.0 to 3.3.3
Fixes #2520 Upgrade of maven from 2.2.1 to 3.0.4
Fixes #2541 Remove CFEngine 3.2.0 patches
Merge branch 'branches/rudder/2.4'

* branches/rudder/2.4:
  Change rudder-webapp and rudder-inventory-endpoint to use settings-external.xml by default. Fixes #2568
Merge branch 'branches/rudder/2.4'

* branches/rudder/2.4:
  Whoops. Remove testing 'echo'es... Refs #2568
Revert "Fixes #2520 CFEngine has been updated from 3.2.0 to 3.3.3"

This reverts commit e5c378d8d44d80102c29b47eb2dac01620615c4f.
Upgrade CFEngine to 3.2.4. Fixes #2583.
Revert "Fixes #2541 Remove CFEngine 3.2.0 patches"

This reverts commit 8ef7706eeb9db70ffa0b00e546ee99aa2b5e58f2.
Fixes #2536: Updated the fusioninventory version from 2.1.9 to 2.2.2 in rudder-agent
Refs #860: Add a password file generation script to rudder-init.sh
Merge branch 'branches/rudder/2.4'

* branches/rudder/2.4:
  Use sample properties file from ldap-inventory. Fixes #2611
  Fixes #2603 Add migration script for eventlog archive
Merge branch 'branches/rudder/2.4'

* branches/rudder/2.4:
  Trivial: restore original URL to make it easier to find
Refs #2255: Enabled the creation of the apache networks include file in the rudder-webapp package
Fixes #2255: The rudder-networks.conf file is now considered as a configuration file by the packaging
Fixes #2625: The rudder-passwords.conf is now automatically installed by the packaging and considered as a configuration file