Fixes #3574 : extends buffer size to have similar behaviour as with CFEngine 3.2
Fixes #3586 - Remove dependencies for tokyocabinet if the OS is not CentOS 6 or later
Fixes #3586: fix filters for tokyocabinet
Merge pull request #60 from jooooooon/bug_3586/int/remove_tokyocabinet_dep_if_not_centos_6_or_later

Bug 3586/int/remove tokyocabinet dep if not centos 6 or later
Fixes #3590: Add migration script for archives entry
Merge pull request #58 from ncharles/bug_3574/int/expand_string_limit_to_8192

Fixes #3574 : extends buffer size to have similar behaviour as with CFEngine 3.2
Merge pull request #62 from VinceMacBuche/bug_3590/archives_migration_script

Fixes #3590: Add migration script for archives entry
Revert "Fixes #3574 : extends buffer size to have similar behaviour as with CFEngine 3.2"

This reverts commit afd145881033096dddda03f0a4e0b134080de1e0.
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5
Merge branch 'branches/rudder/2.5' into branches/rudder/2.6

Conflicts:
	rudder-webapp/SPECS/rudder-webapp.spec
	rudder-webapp/debian/rules
Fixes #3590 - Fix indentation of debian/rules
Merge pull request #63 from nperron/bug_3590/int/fix_indentation_of_debian_rules

Fixes #3590 - Fix indentation of debian/rules
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5
Merge branch 'branches/rudder/2.5' into branches/rudder/2.6

Conflicts:
	rudder-webapp/debian/rules