Fixes #4765: Make the inventory trigger properly as long as /opt/rudder/etc/force_inventory is here
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 #4812: Automatic reparation method for cf_lock.{tcdb,db} is only checked once an hour
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...
Merge branch 'branches/rudder/2.10_aix' into branches/rudder/2.10
Merge pull request #349 from Kegeruneku/bug_4765/dev/4765_use_force_inventory_file_in_initial_promises

Fixes #4765: Make the inventory trigger properly as long as /opt/rudder/...
Merge branch 'branches/rudder/2.6' into branches/rudder/2.8
Merge branch 'branches/rudder/2.8' into branches/rudder/2.9
Merge branch 'branches/rudder/2.9' into branches/rudder/2.10

Conflicts:
	initial-promises/node-server/inventory/1.0/fusionAgent.cf
Fixes #4837: purge removed files in the ncf file copy
Merge pull request #357 from jooooooon/bug_4812/automatic_reparation_method_for_cf_lock_tcdb_db_is_only_checked_once_an_hour

Bug 4812/automatic reparation method for cf lock tcdb db is only checked once an hour
Merge pull request #361 from ncharles/bug_4837/dev/strictly_copy_ncf_files

Fixes #4837: purge removed files in the ncf file copy
Merge branch 'branches/rudder/2.6' into branches/rudder/2.8
Merge branch 'branches/rudder/2.8' into branches/rudder/2.9