Change in ovirt-engine[master]: core: fix db upgrade conflict