Fixes #3853: Fixe or logic in node search
Merge pull request #298 from fanf/bug_3853/or_logic_is_broken_with_regex

Fixes #3853: Fix or logic in node search
Merge branch 'branches/rudder/2.4' into branches/rudder/2.6

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

Conflicts:
	rudder-core/src/test/resources/ldap-data/inventory-sample-data.ldif
	rudder-core/src/test/scala/com/normation/rudder/services/queries/TestQueryProcessor.scala
Merge branch 'branches/rudder/2.7'