Merge .disks_{physical_location,serial+warranty} into .disks.