Fixes #3836: add Oracle and Scientific Linux to fusion parsing
Merge pull request #22 from fanf/bug_3838/add_support_scientific_and_oracle_linux

Fixes #3836: add Oracle and Scientific Linux to fusion parsing
Fixes #3840: Unknown linux are not unknown OS type
Merge pull request #23 from fanf/bug_3840/unknow_os_in_place_of_unknown_linux

Fixes #3840: Unknown linux are not unknown OS type
Merge branch 'branches/rudder/2.4' into branches/rudder/2.6

Conflicts:
	inventory-api/src/main/scala/com/normation/inventory/domain/NodeInventory.scala
	inventory-fusion/src/main/scala/com/normation/inventory/provisioning/fusion/FusionReportUnmarshaller.scala
	inventory-repository/src/main/scala/com/normation/inventory/ldap/core/InventoryMapper.scala
	inventory-repository/src/main/scala/com/normation/inventory/ldap/core/LDAPConstants.scala
Merge branch 'branches/rudder/2.6' into branches/rudder/2.7