Change in ovirt-engine[master]: Revert "core: prevent a race on add template version"