fixes #3332 : correct use of parametrized variables
Fixes #3337 : correct the updates of Directive in case of error to allow the dependants popup to show up
Merge pull request #137 from ncharles/bug_3337/dev/correct_popup_in_directive_form

Fixes #3337 : correct the updates of Directive in case of error to allow...
Merge pull request #136 from ncharles/bug3332/dev/correct_use_of_parametrized_variables

fixes #3332 : correct use of parametrized variables
Merge branch 'branches/rudder/2.3' into branches/rudder/2.4

Conflicts:
	rudder-core/src/main/scala/com/normation/rudder/services/policies/ConfigurationRuleValService.scala
	rudder-core/src/main/scala/com/normation/rudder/services/policies/ParameterizedValueLookupService.scala
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'

Conflicts:
	rudder-core/src/main/scala/com/normation/rudder/services/policies/ConfigurationRuleValService.scala
	rudder-core/src/main/scala/com/normation/rudder/services/policies/ParameterizedValueLookupService.scala
	rudder-web/src/main/scala/com/normation/rudder/web/components/DirectiveEditForm.scala