Merge branch 'stable-2.6-hotplug' into stable-2.6-ippool-hotplug-esi