Fixes #4841: use persistant class in job scheduler to avoid duplicate job execution
Merge pull request #362 from ncharles/bug_4841/dev/dont_use_ifelapsed

Fixes #4841: use persistant class in job scheduler to avoid duplicate job execution
Fixes #4747: propagate ncf promises on relay server
Merge pull request #363 from ncharles/bug_4747/dev/propagate_ncf_on_relay

Bug 4747/dev/propagate ncf on relay
Merge branch 'branches/rudder/2.9' into branches/rudder/2.10
Merge branch 'branches/rudder/2.10'
Fixes #4862: Missing CFEngine body "inventory_files"
Merge pull request #365 from jooooooon/bug_4862/missing_cfengine_body_inventory_files

Fixes #4862: Missing CFEngine body "inventory_files"
Fixes #4758 - Add PATH to ensure binaries are always usables
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 #4866: don't use cpuid on AIX as it doesn't work on this platform
Fixes #4885: Missing CFEngine body "inventory_files" in initial promises
Merge pull request #377 from jooooooon/bug_4885/missing_cfengine_body_inventory_files_in_initial_promises

Fixes #4885: Missing CFEngine body "inventory_files" in initial promises
Merge branch 'branches/rudder/2.6' into branches/rudder/2.9
Merge branch 'branches/rudder/2.9' into branches/rudder/2.10
Merge pull request #369 from nperron/bug_4758/dev/add_path_to_ensure_rsyslogd_bin_works

Fixes #4758 - Add PATH to ensure binaries are always usables
Merge branch 'branches/rudder/2.9' into branches/rudder/2.10
Merge branch 'branches/rudder/2.10'
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