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

This reverts commit a246c553e88ac82146b264e7b14da773c92e9dba.

This commit introduces regressions, reverting !