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