Fixes #4087: rudder-agent upgrade not blocked by disable-agent
Merge pull request #165 from VinceMacBuche/bug_4087/disabled_agent

Fixes #4087: rudder-agent upgrade not blocked by disable-agent
Fixes #4088: Fix policy.xml to metada.xml conversion failure in case of existing metadata.xml
Merge pull request #166 from Kegeruneku/bug_4088/int/4088_fix_policy_xml_to_metadata_conversion_failure

Fixes #4088: Fix policy.xml to metada.xml conversion failure in case of ...
Merge branch 'branches/rudder/2.4' into branches/rudder/2.6
Merge branch 'branches/rudder/2.6' into branches/rudder/2.7

Conflicts:
	rudder-webapp/SOURCES/rudder-upgrade