Fixes #5912: Remove demo data from rudder-init script
Fixes #5906: Do not point to a redirect in rudder-metrics-reporting
Merge pull request #552 from Kegeruneku/bug_5906/int/5906_rudder_metrics_reporting_points_to_a_redirect

Fixes #5906: Do not point to a redirect in rudder-metrics-reporting
Fixes #5825: killall is not available on all system, hence the command to reload the server after promises generation may fail
Merge pull request #548 from peckpeck/bug_5825/killall_is_not_available_on_all_system_hence_the_command_to_reload_the_server_after_promises_generation_may_fail

Fixes #5825: killall is not available on all system, hence the command to reload the server after promises generation may fail
Fixes #5812: Do not fail in rudder-init when hostname -f returns an error
Fixes #5785: dpkg configure error prevents installing rudder-agent due to cf-serverd error
Merge pull request #551 from jooooooon/bug_5912/remove_demo_data_from_rudder_init_script

Fixes #5912: Remove demo data from rudder-init script
Merge pull request #553 from Kegeruneku/bug_5812/int/5812_rudder_init_can_fail_if_hostname_f_fail

Fixes #5812: Do not fail in rudder-init when hostname -f returns an erro...
Merge pull request #550 from peckpeck/bug_5785/dpkg_configure_error_prevents_installing_rudder_agent_due_to_cf_serverd_error

Fixes #5785: dpkg configure error prevents installing rudder-agent due to cf-serverd error
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11

Conflicts:
	rudder-agent/SPECS/rudder-agent.spec
	rudder-agent/debian/postinst
Merge branch 'branches/rudder/2.11' into branches/rudder/3.0

Conflicts:
	rudder-agent/SPECS/rudder-agent.spec
Fixes #5918: Have a devault value for policy_server.dat
Merge pull request #554 from peckpeck/int_5918/have_a_devault_value_for_policy_server_dat

Fixes #5918: Have a devault value for policy_server.dat
Fixes #5935: Remove demo data from packaging
Merge pull request #556 from jooooooon/bug_5935/remove_demo_data_from_packaging

Fixes #5935: Remove demo data from packaging