Fixes #3810 - Add possibility to migrate properties in inventory-web.properties with rudder-upgrade
Merge pull request #94 from nperron/bug_3810/int/fix_migration_of_properties

Fixes #3810 - Add possibility to migrate properties in inventory-web.properties with rudder-upgrade
Merge branch 'branches/rudder/2.4' into branches/rudder/2.6

Conflicts:
	rudder-webapp/SOURCES/rudder-upgrade
Merge branch 'branches/rudder/2.6' into branches/rudder/2.7

Conflicts:
	rudder-webapp/SOURCES/rudder-upgrade