hotplug2: merge worker related fixes into one patch