xenb-05-cb452b1

Merge branch 'master' into perf/xen-heavy-storage-discovery-simplified