Fixes #5240: Write expected reports once per node
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11