Change in ovirt-release[master]: packaging: fix conflicts with ovirt-release34