Change in ovirt-engine[master]: Revert "engine: VdsDeploy cleanup 1"