packaging: fix file conflict when upgrading setup due to versionlock

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