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 #3785: Migrate old API accounts to have an ID
Refs #3785: Make sure no command output gets leaked, in keeping with the rest of the script
Merge pull request #90 from jooooooon/bug_3785/migrate_old_api_accounts_to_have_an_id

Bug 3785/migrate old api accounts to have an
Merge branch 'branches/rudder/2.6' into branches/rudder/2.7

Conflicts:
	rudder-webapp/SOURCES/rudder-upgrade