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