Merge branch 'upstream/pvhvm' into upstream/xen