Fixes #5814: Do not use a SPEC file macro in plain OpenSSL patches
Merge pull request #529 from Kegeruneku/bug_5814/int/5814_no_specfile_like_macro_in_plain_patches

Fixes #5814: Do not use a SPEC file macro in plain OpenSSL patches
Fixes #5815: Trigger slibclean when building OpenSSL on AIX, between make and make install
Fixes #5818: Correct the OpenSSL build on old OSes to use the right architecture
Merge pull request #532 from Kegeruneku/bug_5818/int/5818_fix_openssl_build_arch_detection

Fixes #5818: Correct the OpenSSL build on old OSes to use the right arch...
Fixes #5880: Require latest version of ncf including fixes for reporting
Merge pull request #547 from jooooooon/bug_5880/require_latest_version_of_ncf_including_fixes_for_reporting

Fixes #5880: Require latest version of ncf including fixes for reporting
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11
Merge pull request #530 from Kegeruneku/bug_5815/int/5815_slibclean_between_make_make_install_in_openssl

Fixes #5815: Trigger slibclean when building OpenSSL on AIX, between mak...
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