Ref #3310 : Add support for Solaris OS in inventory
Merge pull request #15 from VinceMacBuche/ust_3309/dev_3310/Solaris_Support

Ref #3309 : Add support for Solaris OS in inventory
Merge branch 'branches/rudder/2.5'

* branches/rudder/2.5:
  Ref #3310 : Add support for Solaris OS in inventory

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/InventoryDit.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