Change in vdsm[master]: oops, fix a bad rebase