Fixes #4490: Have unique ID for new machine inventories
Merge pull request #50 from VinceMacBuche/bug_4490/improve_machine_inventory_handling

Fixes #4490: Have unique ID for new machine inventories
Merge branch 'branches/rudder/2.6' into branches/rudder/2.10