Fixes #5583: allow multiple agent in inventory for a node
Refs #5583: add tests
Fixes #4490: Have unique ID for new machine inventories
Merge pull request #2 from fanf/bug_5583/dev/allow_mutliple_agent

Refs #5583: add tests
Merge pull request #49 from ncharles/bug_5583/dev/allow_mutliple_agent

Fixes #5583: allow multiple agent in inventory for a node
Fixes #5445, Refs #5275: parse windows 2012 name correctly
Refs #5445: add tests about Windows 2012
Merge pull request #48 from ncharles/bug_5275/dev/5445_parse_windows_2012_inventory

Fixes #5445, Refs #5275: parse windows 2012 name correctly
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
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11

Conflicts:
	inventory-fusion/src/test/scala/com/normation/inventory/provisioning/fusion/TestReportParsing.scala
Merge branch 'branches/rudder/2.11' into branches/rudder/3.0