Fixes #4903: Bundle CFEngine manpages with rudder-agent
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