merging qemu support patches
fix to XSL snafu that broke EBS
Merge branch 'maint/3.4/testing' into testing