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