Change in vdsm[master]: tests: consolidate the device XML tests