Fixes #4378: White page with HTTP status: 413: FULL head
Fixes #5749: fix ldif for node-to-relay script
Merge pull request #521 from VinceMacBuche/bug_5749/FIX_NODE_TO_RELAY

Fixes #5749: fix ldif for node-to-relay script
Merge pull request #499 from peckpeck/bug_4378/white_page_with_http_status_413_full_head

Fixes #4378: White page with HTTP status: 413: FULL head
Fixes #5733: Use slibclean on AIX to prevent error during cf- binary updates
Merge pull request #517 from Kegeruneku/bug_5733/int/5733_use_slibclean_on_aix

Fixes #5733: Use slibclean on AIX to prevent error during cf- binary upd...
Merge branch 'branches/rudder/2.6' into branches/rudder/2.10
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
Fixes #5785: dpkg configure error prevents installing rudder-agent due to cf-serverd error
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
Fixes #4903: Bundle CFEngine manpages with rudder-agent
Merge pull request #555 from Kegeruneku/bug_4903/int/4903_bundle_cfengine_manpages

Fixes #4903: Bundle CFEngine manpages with rudder-agent
Fixes #5936: Correct the Debian 5 Tokyocabinet patch
Merge pull request #560 from Kegeruneku/bug_5936/int/5936_correct_debian_5_tckdb_patch

Fixes #5936: Correct the Debian 5 Tokyocabinet patch
Fixes #5984: Build error on RPM due to man pages being included twice

We do not need to include any files from %{rudderdir} in the %files
section of the .spec file, because they are included automatically (see
the comment just before the start of the %files section)
Merge pull request #564 from jooooooon/bug_5984/build_error_on_rpm_due_to_man_pages_being_included_twice

Fixes #5984: Build error on RPM due to man pages being included twice
Fixes #5741: Backport the BDB bundling in slapd from master