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
Merge branch 'branches/rudder/2.5'
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
Merge branch 'branches/rudder/2.5'

* branches/rudder/2.5:
  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 'master' into proto/workflows
Evolution of ChangeRequest datastructure to take care of possible rebase in the process
Some more change in ChangeRequest status, and start of unified modification pop-up
Change Administration menu, add Change request page, try url changes
Add details page, add filter to cr page
 fields detaisl
Improve Genral page organisation
ange status and changes)Improve CR
Try the update of changes
fix compilation of CR management,
Improve Change Status
Begin tree