Fixes #5274 - Add ncf.conf as a config file in order to not replace its content at each upgrade of package
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 #5385: Update rudder-agent-thin after #5380
Merge pull request #459 from Kegeruneku/bug_5385/int/5385_update_rudder_agent_thin_patches

Fixes #5385: Update rudder-agent-thin after #5380
Fixes #5386: rudder-agent 2.11.{0,1} ignore duplicate lines in data files causing rpmPackageInstallation technique to ignore some configurations
Merge pull request #460 from jooooooon/bug_5386/rudder_agent_2_11_0_1_ignore_duplicate_lines_in_data_files_causing_rpmpackageinstallation_technique_to_ignore_some_configurations

Fixes #5386: rudder-agent 2.11.{0,1} ignore duplicate lines in data file...
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
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