Ref #3345: Correct error log display
Merge pull request #207 from VinceMacBuche/bug_3435/shorter_prefix_search_node

Ref #3345: Correct error log display
Fixes #3760: start a new LDAP server for each test
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5
Merge pull request #271 from fanf/bug_3760/falacious_error_in_TestQuickSearchService

Fixes #3760: start a new LDAP server for each test
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5
Merge branch 'branches/rudder/2.5' into branches/rudder/2.6

Conflicts:
	rudder-core/src/main/scala/com/normation/rudder/domain/queries/CmdbQuery.scala
	rudder-core/src/test/scala/com/normation/rudder/services/nodes/TestQuickSearchService.scala
Merge branch 'branches/rudder/2.6'