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
Fixes #4809: Fix APT package manager config Technique to prevent apt.conf.d/99rudder from bloating
Merge pull request #358 from Kegeruneku/bug_4809/dev/4809_stop_99rudder_in_apt_pm_settings_from_bloating

Fixes #4809: Fix APT package manager config Technique to prevent apt.con...