Ref #3345: Correct error log display
Fixes #3622: Add a comparator for not matching a regex
Fixes #3641 Correct some debug log when deleting nodes
Merge pull request #223 from fanf/ust_3613/dev/3622_add_non_regex_matches

Fixes #3622: Add a comparator for not matching a regex
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
Merge branch 'branches/rudder/2.5' into branches/rudder/2.6

Conflicts:
	rudder-core/src/test/scala/com/normation/rudder/domain/policies/RuleValTest.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 branch 'branches/rudder/2.5' into branches/rudder/2.6
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
Fixes #3746 : Remove wrong imports
Merge pull request #262 from VinceMacBuche/bug_3746/remove_imports

Fixes #3746 : Remove wrong imports
Revert "Fixes #3622: Add a comparator for not matching a regex"

This reverts commit b58030adebb6fa9b7c690f7c83d0b02c8cd15bab.
This is a new feature that should not have been merged in
a bug-correction version.
Merge pull request #207 from VinceMacBuche/bug_3435/shorter_prefix_search_node

Ref #3345: Correct error log display