Fixes #5111: remove javascript warning 'variable i redeclares argument'
Merge pull request #558 from ncharles/bug_5111/dev/js_warning

Fixes #5111: remove javascript warning 'variable i redeclares argument'
Merge branch 'branches/rudder/2.6' into branches/rudder/2.9
Merge branch 'branches/rudder/2.9' into branches/rudder/2.10
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11

Conflicts:
	rudder-web/src/main/scala/com/normation/rudder/web/components/RuleEditForm.scala
	rudder-web/src/main/scala/com/normation/rudder/web/services/ReportDisplayer.scala