Fixes #5177: add role rudder-web to rudder-webapp
Merge pull request #424 from peckpeck/bug_5170/rudder_relay_top

Fixes #5177: add role rudder-web to rudder-webapp
Fixes #5186: Rename role properties
Merge pull request #425 from VinceMacBuche/bug_5186/migration_script_role

Fixes #5186: Rename role properties
Fixes #5172: Run the ncf api as the ncf-api user instead of the httpd one and add the configuration repository to the rudder group
Merge pull request #422 from Kegeruneku/bug_5172/int/5172_use_ncf_instead_of_apache_user_for_ncf_api

Fixes #5172: Run the ncf api as the ncf-api user instead of the httpd on...
Fixes #5089: Unrecognized policy server
Merge pull request #426 from jooooooon/bug_5089/unrecognized_policy_server

Fixes #5089: Unrecognized policy server
Fixes #5103: Rudder init now set correct value for auth network after the first
Merge pull request #427 from VinceMacBuche/bug_5103/typo_rudder_init

Fixes #5103: Rudder init now set correct value for auth network after the first
Merge branch 'branches/rudder/2.6' into branches/rudder/2.10
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11

Conflicts:
	rudder-server-root/SOURCES/rudder-init.sh
Fixes #5197 - Add category of ncf_techniques in order to got the MetaTechniques in the WebUI
Fixes #5198: Do not use stat on AIX in check-rudder-agent, but istat instead
Merge pull request #428 from Kegeruneku/bug_5198/int/5198_use_istat_on_aix_no_stat

Fixes #5198: Do not use stat on AIX in check-rudder-agent, but istat ins...
Merge pull request #430 from nperron/bug_5197/dev/add_new_category_xml_from_ncf_techniques

Fixes #5197 - Add category of ncf_techniques in order to got the MetaTechniques in the WebUI
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11

Conflicts:
	rudder-agent/SOURCES/check-rudder-agent