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

Conflicts:
	rudder-core/src/main/scala/com/normation/rudder/services/policies/SystemVariableService.scala
	rudder-core/src/test/scala/com/normation/rudder/domain/policies/RuleValTest.scala
Merge branch 'master' of github.com:Normation/rudder