Change in ovirt-engine[master]: core: unified code for matching VDS (#855776)