Change in vdsm[master]: Fix bad rebase