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