Fixes #4496: rudder-jetty package should conflict with standard jetty packages
Fixes #4493: Add information from /etc/profile to inventories and CFEngine environment
Merge pull request #227 from Kegeruneku/bug_4493/int/4493_add_env_var_informations_to_inventories

Fixes #4493: Add information from /etc/profile to inventories and CFEngi...
Fixes #4494: remove lock on tcdb when promises are not updated often enough
Merge pull request #223 from ncharles/bug_4494/int/remove_lock_on_tcbd_lock

Fixes #4494: remove lock on tcdb when promises are not updated often eno...
Merge pull request #225 from jooooooon/bug_4496/trying_to_overwrite_etc_default_jetty_which_is_also_in_package_rudder_jetty_2_9_2_wheezy0

Fixes #4496: rudder-jetty package should conflict with standard jetty pa...
Fixes #4494: Fix elif syntax error in check-rudder-agent
Merge pull request #228 from VinceMacBuche/4494_fix_elif

Fixes #4494: Fix elif syntax error in check-rudder-agent
Merge branch 'branches/rudder/2.6' into branches/rudder/2.8
Merge branch 'branches/rudder/2.8' into branches/rudder/2.9