Change in ovirt-engine[master]: Revert "core: Make VDS a JPA entity"