Change in vdsm[master]: make ovirt-node detection more robust