Change in vdsm[master]: netConf: fix a sloppy rebase