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 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
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5
Merge branch 'branches/rudder/2.5'
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5

* branches/rudder/2.4:
  Fixes #3340: Bad logic for search queries on nodes with OR and regex leads to wrong results
Merge branch 'branches/rudder/2.5'

* branches/rudder/2.5:
  Fixes #3340: Bad logic for search queries on nodes with OR and regex leads to wrong results

Conflicts:
	rudder-core/src/main/scala/com/normation/rudder/domain/queries/DitQueryData.scala
	rudder-core/src/main/scala/com/normation/rudder/services/queries/LdapQueryProcessor.scala
	rudder-core/src/test/scala/com/normation/rudder/services/queries/TestQueryProcessor.scala
fixes #3325 styles adjustment on directive screen