Fixes #3611 - Change check of postgresql in rudder-upgrade script in order to prevent from a ver slow upgrade of packages of software
Fixes #3618 : correct CFEngine code to have proper reporting on file edition
Fixes #3780: Fixes the Rudder upgrade variable unescaping part to support base64 entries
Merge pull request #70 from ncharles/bug_3618/int/fixe_reporting_on_file_edition

Fixes #3618 : correct CFEngine code to have proper reporting on file edition
Merge pull request #87 from Kegeruneku/bug_3780/int/3780_correct_unescaping_migrationscript_with_base64_support

Fixes #3780: Fixes the Rudder upgrade variable unescaping part to suppor...
Merge pull request #86 from nperron/bug_3611/int/change_check_of_postgresql_inrudder_upgrade_script

Fixes #3611 - Change check of postgresql in rudder-upgrade script in order to prevent from a ver slow upgrade of packages of software
Fixes #3810 - Add possibility to migrate properties in inventory-web.properties with rudder-upgrade
Merge pull request #94 from nperron/bug_3810/int/fix_migration_of_properties

Fixes #3810 - Add possibility to migrate properties in inventory-web.properties with rudder-upgrade
Merge branch 'branches/rudder/2.4' into branches/rudder/2.6

Conflicts:
	rudder-webapp/SOURCES/rudder-upgrade
Fixes #3813: Add rsync as installation dep on rudder-webapp to prevent rudder-upgrade script failure
Merge pull request #95 from Kegeruneku/bug_3813/int/3813_add_rsync_as_installation_dependency

Fixes #3813: Add rsync as installation dep on rudder-webapp to prevent r...
Fixes #3721: Make failed Jetty JVM launches explicit (especially about RAM prerequisites)
Merge branch 'branches/rudder/2.4' into branches/rudder/2.6
Fixes #3834 : Apply Patch to fusion inventory to handle Scientific Linux
Merge pull request #97 from VinceMacBuche/bug_3834/Add_Scientific_linux_suport

Fixes #3834 : Apply Patch to fusion inventory to handle Scientific Linux
Merge branch 'branches/rudder/2.4' into branches/rudder/2.6

Conflicts:
	rudder-agent/SOURCES/Makefile
Fixes #3837 : Add fusionInventory patch to handle Oracle Linux Server OS
Merge pull request #98 from VinceMacBuche/bug_3837/Oracle_linux

Fixes #3837 : Add fusionInventory patch to handle Oracle Linux Server OS
Merge branch 'branches/rudder/2.4' into branches/rudder/2.6

Conflicts:
	rudder-agent/SOURCES/Makefile
Fixes #3856 - Fix typo into Makefile which prevent from removing rudder agent cron file on debian folder