Change in ovirt-engine[master]: core: Fix storage allocation check when merging a snapshot