Refs #4805 : Initial commit
Correct identation
Fixes #4805 : Modify the way file edition and reporting is done for proper convergence
Merge pull request #356 from ncharles/bug_4805/dev/make_file_edition_convergent

Bug 4805/dev/make file edition convergent
Merge branch 'branches/rudder/2.6' into branches/rudder/2.9
Merge branch 'branches/rudder/2.9' into branches/rudder/2.10