Change in ovirt-engine[master]: core: refactor OVF_STORE update on deactivate