Fixes #4962: Enable Rudder integration with an eventual system jetty installation
Merge pull request #348 from Kegeruneku/ust_4924/int/4962_enable_system_jetty_integration

Fixes #4962: Enable Rudder integration with an eventual system jetty ins...
Fixes #4989: Add rudder-plugin to the files provided with Rudder
Fixes #5080: Roles overwritten during package installation
Merge pull request #391 from jooooooon/bug_5080/roles_overwritten_during_package_installation

Fixes #5080: Roles overwritten during package installation
Merge pull request #355 from Kegeruneku/ust_4989/int/4990_add_rudder_plugin_to_rudder_webapp

Fixes #4989: Add rudder-plugin to the files provided with Rudder
Fixes #5101: Roles overwritten during package installation - debian postinst
Merge pull request #392 from jooooooon/bug_5101/roles_overwritten_during_package_installation_debian_postinst

Fixes #5101: Roles overwritten during package installation - debian post...
Fixes #5102: Stop packaging jetty-init-rudder.patch (useless file)
Merge pull request #393 from Kegeruneku/bug_5102/int/5102_remove_jetty_init_rudder_from_packages

Fixes #5102: Stop packaging jetty-init-rudder.patch (useless file)
Fixes #5098: Incorrect rsyslog-pgsql config
Merge pull request #396 from jooooooon/bug_5098/incorrect_rsyslog_pgsql_config

Fixes #5098: Incorrect rsyslog-pgsql config
Fixes #5109: Cleanup environment before building rudder-agent-thin
Merge pull request #397 from Kegeruneku/bug_5109/int/5109_clean_enviroment_before_building_rudder_agent_thin

Fixes #5109: Cleanup environment before building rudder-agent-thin
Fixes #5110: Checkout rudder-agent changelog before building rudder-agent-thin
Merge pull request #398 from Kegeruneku/bug_5110/int/5110_checkout_changelog_in_rudder_agent_thin

Fixes #5110: Checkout rudder-agent changelog before building rudder-agen...
Fixes #5113: Correct rudder-agent-thin Makefile to have a correct localclean target
Merge pull request #399 from Kegeruneku/bug_5113/int/5113_correct_rudder_agent_thin_localclean

Fixes #5113: Correct rudder-agent-thin Makefile to have a correct localc...
Merge branch 'branches/rudder/2.11'