Change in jenkins[master]: ovirt-engine_upgrade_stable_to_3.4: more cleanups