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...
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...
Merge branch 'branches/rudder/2.6' into branches/rudder/2.8