Change in vdsm[master]: vdsm: Code simplifications