Fixes #4903: Bundle CFEngine manpages with rudder-agent
Fixes #5940: Update to CFEngine 3.6.3 FINAL
Merge pull request #557 from Kegeruneku/ust_5939/int/5940_update_to_cfengine_3_6_3_final

Fixes #5940: Update to CFEngine 3.6.3 FINAL
Merge pull request #555 from Kegeruneku/bug_4903/int/4903_bundle_cfengine_manpages

Fixes #4903: Bundle CFEngine manpages with rudder-agent
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11

Conflicts:
	rudder-agent/SPECS/rudder-agent.spec
Merge branch 'branches/rudder/2.11' into branches/rudder/3.0