Fixes #3333: add the reason for deployment failure in the app logs
Ref #3332: Catch disable PI case, clear logs in deployment
Merge pull request #139 from VinceMacBuche/bug_3332/correct_use_of_parametrized_variables

Ref #3332: Catch disable PI case, clear logs in deployment
Merge branch 'branches/rudder/2.3' into branches/rudder/2.4

Conflicts:
	rudder-core/src/main/scala/com/normation/rudder/services/policies/ConfigurationRuleValService.scala
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5
Fixes #3286: system items can not be modified like non-system ones
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
Fixes #3348: missing header for ModificationService
fixes #3328 links correctly displayed in event logs
Merge pull request #145 from aesraethr/bug_3328/dev/links_in_eventlogs

fixes #3328 links correctly displayed in event logs
Merge pull request #140 from fanf/bug_3286/dev/system_item_should_not_be_modifiable_by_public_api

Fixes #3286: system items can not be modified like non-system ones
Merge pull request #142 from fanf/bug_3348/missing_header_for_ModificationService

Fixes #3348: missing header for ModificationService
Refs #3333 : correct typo
Merge pull request #135 from ncharles/bug3333/dev/add_deployment_failure_reason_in_log

Fixes #3333: add the reason for deployment failure in the app logs
Merging 2.3 into 2.4
Merging 2.4 into 2.5