Fixes #3641 Correct some debug log when deleting nodes
Merge pull request #227 from VinceMacBuche/bug_3641/correct_current_debug_log

Fixes #3641 Correct some debug log when deleting nodes
Fixes #3642 : create a migration script to undot all generic variable definition variable name
Merge pull request #255 from ncharles/bug_3642/dev/create_migration_script_to_undot_all_variable_name

Fixes #3642 : create a migration script to undot all generic variable definition variable name
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5

Conflicts:
	rudder-web/src/main/scala/bootstrap/liftweb/AppConfig.scala
Merge branch 'branches/rudder/2.5' into branches/rudder/2.6

Conflicts:
	rudder-web/src/main/scala/bootstrap/liftweb/AppConfig.scala
Merge branch 'branches/rudder/2.6'

Conflicts:
	rudder-core/src/main/scala/com/normation/rudder/services/servers/NodeConfigurationServiceImpl.scala