Fixes #5941: Synchronize rudder-agent with rudder-agent-thin
Fixes #5936: Correct the Debian 5 Tokyocabinet patch
Merge pull request #559 from Kegeruneku/bug_5941/int/5941_synchronise_agent_with_agent_thin

Fixes #5941: Synchronize rudder-agent with rudder-agent-thin
Merge pull request #560 from Kegeruneku/bug_5936/int/5936_correct_debian_5_tckdb_patch

Fixes #5936: Correct the Debian 5 Tokyocabinet patch
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11

Conflicts:
	rudder-agent/SOURCES/patch-DEBIAN_5-compile-tokyocabinet.patch
Merge branch 'branches/rudder/2.11' into branches/rudder/3.0
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
Merging 2.10 into 2.11
Fixes #5978: RPM complains about missing files for ghost files
Merge pull request #565 from peckpeck/bug_5978/rpm_complains_about_missing_files_for_ghost_files

Fixes #5978: RPM complains about missing files for ghost files
Merge branch 'branches/rudder/2.11' into branches/rudder/3.0
Fixes #5903: rudder-metrics-reporting is relying on local CA bundles to validate https
Fixes #6011: add migration script for change of table reports execution
Merge pull request #568 from ncharles/bug_6011/int/migration_for_insertionid

Fixes #6011: add migration script for change of table reports execution
Fixes #6018: correct path to the rudder policy server uuid in fusion inventory agent
Merge pull request #569 from ncharles/bug_6018/int/path_of_rudder_uuid

Fixes #6018: correct path to the rudder policy server uuid in fusion inv...
Fixes #6025: Typo in migration filename in .spec file
Merge pull request #566 from peckpeck/bug_5903/rudder_metrics_reporting_is_relying_on_local_ca_bundles_to_validate_https

Fixes #5903: rudder-metrics-reporting is relying on local CA bundles to validate https
Merge pull request #570 from jooooooon/bug_6025/typo_in_migration_filename_in_spec_file

Fixes #6025: Typo in migration filename in .spec file