Merge to v3.13-rc7 for prerequisite changes in the Xen code for TPM