Fixes #3669: allow several IP on the same interface
Merge pull request #21 from fanf/bug_3669/dev/net_interface_can_have_several_ip

Fixes #3669: allow several IP on the same interface
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5

Conflicts:
	inventory-fusion/src/main/scala/com/normation/inventory/provisioning/fusion/FusionReportUnmarshaller.scala
Merge branch 'branches/rudder/2.5' into branches/rudder/2.6

Conflicts:
	inventory-fusion/src/main/scala/com/normation/inventory/provisioning/fusion/FusionReportUnmarshaller.scala
Merge branch 'branches/rudder/2.6'