Fixes #3955: enforce correct list of nodes in the expected reports database
Fixes #4377: Change file name of parameter
Merge pull request #423 from VinceMacBuche/bug_4377/parameter_fileName

Fixes #4377: Change file name of parameter
Merge pull request #402 from ncharles/bug_3955/dev/missing_node_in_reports

Fixes #3955: enforce correct list of nodes in the expected reports database
Merge branch 'branches/rudder/2.6' into branches/rudder/2.7

Conflicts:
	rudder-core/src/main/scala/com/normation/rudder/services/reports/ReportingServiceImpl.scala
Merge branch 'branches/rudder/2.7' into branches/rudder/2.8

Conflicts:
	rudder-core/src/main/scala/com/normation/rudder/services/reports/ReportingServiceImpl.scala