Change in ovirt-engine[master]: core: Fix NPE during merge of snapshots