Fixes #4799 - Integrate latest CFE 3.6

Fixes #4799 - Integrate latest CFE 3.6

cf http://www.rudder-project.org/redmine/issues/4799

This PR starts where https://github.com/Normation/rudder-packages/pull/314 ended.