Fixes #4798: Switch to CFEngine 3.6.0b1 for Rudder 2.11
Refs #4799 - Remove all occurences to tokyocabinet and add dependency for PAM which is a new prerequisite
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.
Merge branch 'branches/rudder/2.11'
Merge branch 'branches/rudder/2.11'
Merge branch 'branches/rudder/2.11'
Merge branch 'branches/rudder/2.11'
Merge branch 'branches/rudder/2.11'
Merge branch 'branches/rudder/2.11'
Merge branch 'branches/rudder/2.11'
Merge branch 'branches/rudder/2.11'
Merge branch 'branches/rudder/2.11'
Merge branch 'branches/rudder/2.11'
Merge branch 'branches/rudder/2.11'
Merge branch 'branches/rudder/2.11'
Merge branch 'branches/rudder/2.11'
Merge branch 'branches/rudder/2.11'
Merge branch 'branches/rudder/2.11'