Fixes #4387: Upgrade rudder-server-root 2.9.1 to 2.9.2 fails on rudder-agent on Ubuntu 12.04 LTS
rudder-agent/SOURCES/vzps.py: Act as ps if no CTID is given and just output the complete process table
Fixes #5470: do not add root roles into ldap
Merge pull request #476 from ncharles/bug_5470/do_not_add_root_roles_into_ldap

Fixes #5470: do not add root roles into ldap
Merge pull request #462 from jooooooon/bug_4387/upgrade_rudder_server_root_2_9_1_to_2_9_2_fails_on_rudder_agent_on_ubuntu_12_04_lts

Fixes #4387: Don't fail on rudder-agent stop, force stop if necessary
Change the logic to have positive named value
Fixes #5419: correct the version comparision for FusionInventory
Merge pull request #467 from ncharles/bug_5419/int/correct_verson_comparision

Fixes #5419: correct the version comparision for FusionInventory
Merge branch 'branches/rudder/2.6' into branches/rudder/2.10

Conflicts:
	rudder-agent/SPECS/rudder-agent.spec
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11
Fixes #5495: upgrade on 2.11 does not end correctly
Merge pull request #475 from coredumb/vzps_handle_noCTID

rudder-agent/SOURCES/vzps.py: Act as ps if no CTID is given and just out...
Merge pull request #477 from jooooooon/bug_5495/upgrade_on_2_11_does_not_end_correctly

Fixes #5495: upgrade on 2.11 does not end correctly
Fixes #5500: Clear error log on rudder-upgrade
Merge pull request #478 from VinceMacBuche/bug_5500/upgrade_service_log

Fixes #5500: Clear error log on rudder-upgrade
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11

Conflicts:
	rudder-webapp/SOURCES/rudder-upgrade
Fixes #5532: Revert "package list-compatible-inputs in rudder-webapp package"

This reverts commit d0577b7c8e4d339e72ab67ae280a6f536c91f3ff.
Merge pull request #481 from VinceMacBuche/bug_5532/revert

Fixes #5532: Revert "package list-compatible-inputs in rudder-webapp pac...
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11

Conflicts:
	rudder-webapp/debian/rules
Fixes #5522: Add fixed dependency on ncf >= 0.201409120000