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
Fixes #4812: Automatic reparation method for cf_lock.{tcdb,db} is only checked once an hour
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 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
Fixes #4869 - Uncomment 'set -e' to permit to stop at encountered error
Merge pull request #370 from nperron/bug_4869/dev/permit_script_to_stop_at_encountered_error

Fixes #4869 - Uncomment 'set -e' to permit to stop at encountered error
Fixes #3855 - Add specific package_methods rudder_yum to manage RPM on RHEL with less requests to RHN and use them on Techniques 'System', 'Inventory' and 'NTP'

Conflicts:
	techniques/systemSettings/misc/clockConfiguration/1.0/clockConfiguration.st
Merge pull request #380 from nperron/bug_3855/dev/add_new_package_methods_and_fix_package_method_for_rhel_rudder_2_6

Fixes #3855 - Add specific package_methods rudder_yum to manage RPM on RHEL with less requests to RHN and use them on Techniques 'System', 'Inventory' and 'NTP'