Fixes #4326: Add rudder-root-rename to the rudder-server-root package
Merge pull request #208 from Kegeruneku/ust_4325/int/4326_add_hostname_changing_script_to_rudder_packaging

Fixes #4326: Add rudder-root-rename to the rudder-server-root package
Fixes #4381: Special characters (ie, accents such as éèùô) are replaced by "?" in CFEngine promises
Merge pull request #210 from jooooooon/bug_4381/special_characters_ie_accents_such_as_are_replaced_by_in_cfengine_promises

Fixes #4381: Special characters (ie, accents such as éèùô) are replaced ...
Merge branch 'branches/rudder/2.6' into branches/rudder/2.7
Refs #3928: add a check in script to count number of agent/executor running, and kill them if more than 8 are running
Refs #3928: adding a vzps like script, to detect processes on vz system. Contributed by Oliver Mauras
Refs #3928: correct scripts, and install it
Merge pull request #211 from ncharles/bug_3928/dev/check_nb_of_process

Refs #3928: add a check in script to count number of agent/executor running, and kill them if more than 8 are running
Merge branch 'branches/rudder/2.7' into branches/rudder/2.8

Conflicts:
	rudder-server-root/SPECS/rudder-server-root.spec
	rudder-server-root/debian/control
Fixes #3928: Fix spec file to include vzps.py
Merge pull request #212 from VinceMacBuche/3928/fix_spec_file

Fixes #3928: Fix spec file to include vzps.py
Merge branch 'branches/rudder/2.8' into branches/rudder/2.9

Conflicts:
	rudder-agent/SPECS/rudder-agent.spec