Fixes #5274 - Add ncf.conf as a config file in order to not replace its content at each upgrade of package
Fixes #5319: Remove demo webapps from Jetty
Merge pull request #446 from nperron/bug_5274/int/add_ncf_conf_as_conffile

Fixes #5274 - Add ncf.conf as a config file in order to not replace its content at each upgrade of package
Fixes #4387: Upgrade rudder-server-root 2.9.1 to 2.9.2 fails on rudder-agent on Ubuntu 12.04 LTS
Merge pull request #449 from Kegeruneku/bug_5319/int/5319_remove_demo_useless_elements_from_jetty

Fixes #5319: Remove demo webapps from Jetty
Merge branch 'branches/rudder/2.6' into branches/rudder/2.9
Merge branch 'branches/rudder/2.9' into branches/rudder/2.10
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11
Merge branch 'branches/rudder/2.11'
Fixes #5415: package list-compatible-inputs in rudder-webapp package
Merge pull request #464 from VinceMacBuche/bug_4515/package_list-compatible-inputs

Fixes #5415: package list-compatible-inputs in rudder-webapp package
Fixes #5418: runs the update_action bundles at the end of rudder-init, to enforce that files are all copied
Merge pull request #465 from ncharles/bug_5402/int/5418_run_update_at_end_of_run

Fixes #5418: runs the update_action bundles at the end of rudder-init, t...
Fixes #5420: Copy tools by running propagatePromises after init
Merge pull request #466 from VinceMacBuche/bug_5420/propagate_promises

Fixes #5420: Copy tools by running propagatePromises after init
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11

Conflicts:
	rudder-server-root/SOURCES/rudder-init.sh
	rudder-webapp/debian/rules
Merge branch 'branches/rudder/2.11'
Fixes #5467: implement openvz support for rudder 2.11
Merge pull request #470 from peckpeck/bug_5467/implement_openvz_support_for_rudder_2_11

Fixes #5467: implement openvz support for rudder 2.11
Fixes #5477: implement openvz support for rudder 2.11