Fixes #5355 - Move WSGI socket in a generic folder instead of a wrong location on RHEL
Merge pull request #453 from nperron/bug_5355/dev/fix_wsgi_socket_in_wrong_folder

Fixes #5355 - Move WSGI socket in a generic folder instead of a wrong location on RHEL
Fixes #5370: Use /srv/www as Apache DocumentRoot on SLES
Merge pull request #455 from Kegeruneku/bug_5370/int/5370_use_srv_www_as_documentroot_on_suse

Fixes #5370: Use /srv/www as Apache DocumentRoot on SLES
Merge branch 'branches/rudder/2.6' into branches/rudder/2.10
Refs #5370: Update the fix for 2.10+ branches
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11
Fixes #5274 - Add ncf.conf as a config file in order to not replace its content at each upgrade of package
Fixes #5199: Add net-tools to rudder-agent dependencies
Merge pull request #431 from Kegeruneku/bug_5199/int/5199_add_net_tools_as_rudder_agent_dependency

Fixes #5199: Add net-tools to rudder-agent dependencies
Merge pull request #456 from nperron/bug_5274/int/add_ncf_conf_as_conffile

Fixes #5274 - Add ncf.conf as a config file in order to not replace its content at each upgrade of package
Merge branch 'branches/rudder/2.6' into branches/rudder/2.10
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11
Refs #5199: Add net-tools as a dependency for RHEL and Fedora too
Merge branch 'branches/rudder/2.6' into branches/rudder/2.10
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11
Refs #5199: Update rudder-agent-thin patches
Fixes #5379: Add a patch to correct empty files beeing created when templates are used with nolocks option in CFEngine
Merge pull request #457 from Kegeruneku/bug_5379/int/5379_correct_zero_sized_files_when_using_templates

Fixes #5379: Add a patch to correct empty files beeing created when temp...
Fixes #5380 - Remove whitespace in debian/contol file of rudder-agent