Fixes #4929: add tags SERVER_ROLES and SERVER_ROLE in the inventory
Merge pull request #391 from ncharles/ust_4928/dev/4929_add_roles_in_inventory

Fixes #4929: add tags SERVER_ROLES and SERVER_ROLE in the inventory
Fixes #4932: improve users insertion into inventory
Merge pull request #392 from ncharles/bug_4932/dev/improve_users_insertion_into_inventory

Fixes #4932: improve users insertion into inventory
Merge branch 'branches/rudder/2.6' into branches/rudder/2.9
Merge branch 'branches/rudder/2.9' into branches/rudder/2.10
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11
Merge branch 'branches/rudder/2.11'