Fixes #3298 : Automatic report logger is starting again
Merge pull request #125 from VinceMacBuche/bug_3298/Start_automatic_report_logger

Fixes #3298 : Automatic report logger is starting again
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
Ref #3332: Catch disable PI case, clear logs in deployment
Merge pull request #139 from VinceMacBuche/bug_3332/correct_use_of_parametrized_variables

Ref #3332: Catch disable PI case, clear logs in deployment
Merge branch 'branches/rudder/2.3' into branches/rudder/2.4

Conflicts:
	rudder-core/src/main/scala/com/normation/rudder/services/policies/ConfigurationRuleValService.scala
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5
Merge branch 'branches/rudder/2.5'
Fixes #3340: Bad logic for search queries on nodes with OR and regex leads to wrong results
Merge pull request #141 from fanf/bug_3340/dev/OR_queries_with_regex_yield_bad_result

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

* branches/rudder/2.3:
  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
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
Merge branch 'master' into proto/workflows