[JIRA] (OVIRT-1507) Fix issues with slave setup code