Fixes #3866: node search with OR and include policy server return zero results
Merge pull request #297 from fanf/bug_3866/or_and_include_policy_server_lead_to_zero_result

Fixes #3866: node search with OR and include policy server return zero results
Merge branch 'branches/rudder/2.4' into branches/rudder/2.6

Conflicts:
	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.6' into branches/rudder/2.7

Conflicts:
	rudder-core/src/test/scala/com/normation/rudder/services/queries/TestQueryProcessor.scala
Missing merged file
Merge branch 'branches/rudder/2.7'