Change in ovirt-engine[master]: packaging: fix file conflict when upgrading setup due to ver...