packaging: fix file conflict when upgrading setup due to versionlock
packaging: fix file conflict when upgrading setup due to versionlock

Change-Id: I2f69ac24b375ecbc0abecec4f617cfb97309e390
Signed-off-by: Alon Bar-Lev <2e3ceb4d37adc6ae3ccc00d3646e0e0a036ace03@redhat.com>

halober/ovirt-engine,OpenUniversity/ovirt-engine,zerodengxinchao/ovirt-engine,walteryang47/ovirt-engine,eayun/ovirt-engine,eayun/ovirt-engine,yingyun001/ovirt-engine,halober/ovirt-engine,yapengsong/ovirt-engine,zerodengxinchao/ovirt-engine,yapengsong/ovirt-engine,OpenUniversity/ovirt-engine,OpenUniversity/ovirt-engine,yingyun001/ovirt-engine,yapengsong/ovirt-engine,zerodengxinchao/ovirt-engine,OpenUniversity/ovirt-engine,yingyun001/ovirt-engine,halober/ovirt-engine,eayun/ovirt-engine,walteryang47/ovirt-engine,yingyun001/ovirt-engine,yapengsong/ovirt-engine,yapengsong/ovirt-engine,zerodengxinchao/ovirt-engine,OpenUniversity/ovirt-engine,zerodengxinchao/ovirt-engine,eayun/ovirt-engine,eayun/ovirt-engine,walteryang47/ovirt-engine,yingyun001/ovirt-engine,halober/ovirt-engine,walteryang47/ovirt-engine,walteryang47/ovirt-engine