Fixes #4769: purge cf_lock tokyocabinet database if bigger than 10 Mo
Merge pull request #317 from ncharles/bug_4769/dev/purge_cf_lock_if_bigger_than_10_mo

Fixes #4769: purge cf_lock tokyocabinet database if bigger than 10 Mo
Merge branch 'branches/rudder/2.9' into branches/rudder/2.10

Conflicts:
	rudder-agent/SOURCES/check-rudder-agent
Merge branch 'branches/rudder/2.10'
Fixes #4875 - Remove javadoc folder from jetty
Merge pull request #321 from nperron/ust_4870/int/4875_remove_useless_javadoc

Fixes #4875 - Remove javadoc folder from jetty
Fixes #4886: Fix rudder-agent SPEC post installation on AIX (missing quote)
Merge pull request #323 from Kegeruneku/bug_4886/dev/4886_fix_rudder_agent_post_inst_for_aix

Fixes #4886: Fix rudder-agent SPEC post installation on AIX (missing quo...
Merge branch 'branches/rudder/2.10'
Fixes #4865: Correct check_rudder_agent not to use init.d on AIX and optimise os family detection (call uname only one time)
Merge pull request #324 from Kegeruneku/bug_4865/dev/4865_fix_check_rudder_agent_script_aix_incompatibility

Fixes #4865: Correct check_rudder_agent not to use init.d on AIX and opt...
Merge branch 'branches/rudder/2.10'
Fixes #4798: Switch to CFEngine 3.6.0rc1 for Rudder

Co-Authored-By: Nicolas PERRON <nicolas.perron@normation.com>