Fixes #3721: Make failed Jetty JVM launches explicit (especially about RAM prerequisites)
Fixes #3862 - Fix wrong name of vhost file used on RPM system
Fixes #3864 - Fix wrong name of logrotate file in Debian/Ubuntu
Merge pull request #102 from nperron/bug_3864/int/fix_wrong_name_of_logrotate_installed_by_packaging

Fixes #3864 - Fix wrong name of logrotate file in Debian/Ubuntu
Fixes #3654 - Fix unexpanded variables from installed cron file
Merge pull request #99 from nperron/bug_3654/int/fix_unexpanded_variables_in_installed_cron_file

Fixes #3654 - Fix unexpanded variables from installed cron file
Fixes #3634: Cleaned up the post install and removal script of rudder-agent to prevent installation and removal surprises
Fixes #3882 - Fix wrong dependencies on SLES for rudder-agent packages
Merge pull request #106 from nperron/bug_3882/int/fix_wrong_deps_for_sles

Fixes #3882 - Fix wrong dependencies on SLES for rudder-agent packages
Merge branch 'branches/rudder/2.4' into branches/rudder/2.6
Merge branch 'branches/rudder/2.6' into branches/rudder/2.7
Fixes #3721: Make failed Jetty JVM launches explicit (especially about RAM prerequisites) - Second iteration after TR
Merge pull request #105 from Kegeruneku/bug_3634/int/3634_correct_rudder_agent_removal_and_installation_scripts

Fixes #3634: Cleaned up the post install and removal script of rudder-ag...
Merge pull request #101 from nperron/bug_3862/int/typo_into_apache_vhost_file

Fixes #3862 - Fix wrong name of vhost file used on RPM system
Fixes #3721: Make failed Jetty JVM launches explicit (especially about RAM prerequisites) - Third iteration after TR
Merge pull request #96 from Kegeruneku/bug_3721/int/3721_make_jetty_ram_outages_explicit

Fixes #3721: Make failed Jetty JVM launches explicit (especially about R...
Fixes #3891: create a migration script for name length limitation in the database
Merge pull request #107 from ncharles/bug_3883/int/migration_script_for_user_name_length

Bug 3883/int/migration script for user name length
Merge branch 'branches/rudder/2.4' into branches/rudder/2.6

Conflicts:
	rudder-agent/SPECS/rudder-agent.spec
	rudder-webapp/SOURCES/rudder-upgrade
	rudder-webapp/SPECS/rudder-webapp.spec
	rudder-webapp/debian/rules
Merge branch 'branches/rudder/2.6' into branches/rudder/2.7

Conflicts:
	rudder-server-root/SOURCES/rudder-init.sh
	rudder-webapp/SOURCES/rudder-upgrade
	rudder-webapp/debian/postinst
	rudder-webapp/debian/rules