Fixes #4798: Switch to CFEngine 3.6.0b1 for Rudder 2.11
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
Refs #4799 - Remove all occurences to tokyocabinet and add dependency for PAM which is a new prerequisite
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 #4882: Do not duplicate network interface entries in fusion reports on AIX
Merge pull request #322 from nperron/ust_4798/int/4799_upgrade_to_cfengine_3_6_npe

Fixes #4799 - Integrate latest CFE 3.6
Revert "Refs #4799 - Remove all occurences to tokyocabinet and add dependency for PAM which is a new prerequisite"

This reverts commit de97ceb5736b1fd90d77d52a55ad5e033632c818.

This commit only targets 2.11 and should not be applied to master.
Revert "Fixes #4798: Switch to CFEngine 3.6.0b1 for Rudder 2.11"

This reverts commit 258417abc93d57adb86a305c7d6d9031c4f6ee3d.

This commit only targets 2.11 and should not be applied to master.
Fixes #4798: Switch to CFEngine 3.6.0rc1 for Rudder

Co-Authored-By: Nicolas PERRON <nicolas.perron@normation.com>
Merge pull request #326 from Kegeruneku/ust_4798/int/4799_upgrade_to_cfengine_3_6

Fixes #4798: Switch to CFEngine 3.6.0rc1 for Rudder
Revert "Fixes #4798: Switch to CFEngine 3.6.0rc1 for Rudder"

This reverts commit a246c553e88ac82146b264e7b14da773c92e9dba.

This commit introduces regressions, reverting !
Fixes #4798: Switch to CFEngine 3.6.0rc1 for Rudder

Co-Authored-By: Nicolas PERRON nicolas.perron@normation.com
Merge pull request #327 from Kegeruneku/ust_4798/int/4799_upgrade_to_cfengine_3_6

Fixes #4798: Switch to CFEngine 3.6.0rc1 for Rudder
Merge branch 'branches/rudder/2.11'