Merge branch 'xen/xenbus' into upstream/xen