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
Correct a merge error leading to build failure
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
Fixes #3872: use a string comparator for storage->name, not a memory one
Merge pull request #299 from fanf/bug_3872/search_type_memory_for_storage_name

Fixes #3872: use a string comparator for storage->name, not a memory one
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
Fixes #3874 : Correct API Nodes : pending nodes details and change
status
Merge branch 'branches/rudder/2.4' into branches/rudder/2.6
Merge branch 'branches/rudder/2.6' into branches/rudder/2.7
Merge pull request #300 from VinceMacBuche/bug_3874/pending_nodes_bug

Fixes #3874 : Correct API Nodes : pending nodes details and change status
Fixes #3863: correct ordering in groups and categories display
Fixes #3823: correct the style of the delete button on the parameters page
Merge pull request #304 from ncharles/bug_3823/dev/delete_button_style

Bug 3823/dev/delete button style
Fixes #3880: only accept/refuse node by node to not loose errors