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 #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