Merge 0.9.32 and 0.9.33 releases, then merge to master

Master forked before the 0.9.32 and 0.9.33 releases, with 0.9.32 becoming a dead-end containing fixes for xenserver-core, whereas 0.9.33 was tagged from master which didn't have those fixes.   This changeset merges 0.9.32 and 0.9.33 to make a 0.9.34 release, then merges that branch with the current master.