Fixes #3358: upgrade log of registered properties when Rudder starts
Fixes #3382 : Handle Missing machine inventory in NodeInfoService
Merge pull request #151 from VinceMacBuche/bug_3382/Machine_Inventory_on_rudder_installation

Fixes #3382 : Handle Missing machine inventory in NodeInfoService
Merge pull request #124 from ncharles/ust_3290/dev/3291_implement_hiddable_sections

Fixes #3291 : add a 'foldable' attribute, with true or false value, that...
Merge pull request #144 from ncharles/arc_3334/int/3342_create_migration_script_for_expected_reports

Fixes #3342: add a migration script for the unexpanded component values
Merge pull request #143 from ncharles/arc_3334/dev/3347_store_unexpanded_version_of_values_as_well

Fixes #3347 : store unexpanded and expanded version of variables for
Merge pull request #153 from ncharles/bug_3387/dev/add_caching_in_grid

Fixes #3387 : add a cache in the RuleGrid to prevent duplicate queries
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5
Change version of pom.xml to 2.6.0~alpha6-SNAPSHOT
Merge branch 'branches/rudder/2.5'

Conflicts:
	rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPDirectiveRepository.scala
	rudder-web/src/main/scala/com/normation/rudder/web/components/RuleGrid.scala
Revert "Merge branch 'branches/rudder/2.5'"

This reverts commit 107c8a65bf0ec2ec9f0bbc6d9cadd0373237c0de, reversing
changes made to de47b1153a9dc5865ec077cd41c099126a9ea7cc.
Merge pull request #148 from fanf/ust_3357/dev/3358_change_log_of_registered_properties

Ref #3357 Fixes #3358: upgrade log of registered properties when Rudder starts
Fixes #3387 : add a cache in the RuleGrid to prevent duplicate queries
Fixes #3317 : corrects the reporting to remove hack introduced by refs #3160