Ref #3345: Correct error log display
Fixes #3641 Correct some debug log when deleting nodes
Fixes #3689: Allows to have a parameter in the middle of some text
Merge pull request #251 from fanf/bug_3686/dev/allows_parameter_in_middle_of_text

Fixes #3689: Allows to have a parameter in the middle of some text
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5

Conflicts:
	rudder-core/src/main/scala/com/normation/rudder/services/policies/ParameterizedValueLookupService.scala
Fixes #3688: Repaire JS broken in group and directive screens
Merge pull request #260 from fanf/bug_3688/dev/all_js_is_broken_for_group_and_directive_screens

Fixes #3688: Repaire JS broken in group and directive screens
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 pull request #207 from VinceMacBuche/bug_3435/shorter_prefix_search_node

Ref #3345: Correct error log display
Fixes #3760: start a new LDAP server for each test
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5
Merge pull request #271 from fanf/bug_3760/falacious_error_in_TestQuickSearchService

Fixes #3760: start a new LDAP server for each test
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5
Ref #3768 : You can now restore Rules with old file format
Merge pull request #272 from VinceMacBuche/bug_3768/restore_old_fileformat_Rule

Ref #3768 : You can now restore Rules with old file format
Fixes #3764 : Reload technique library button is not broken anymore
Merge pull request #275 from VinceMacBuche/bug_3764/reload_tech_library_button_broken

Fixes #3764 : Reload technique library button is not broken anymore