CA-82314

Import the patch from xen-api