packaging: fix issue with conflict of latest two independent merges

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