Pull cpu-hotplug into release branch