This merge brings in a few fixes that I would have sent this week, had
there been a 5.7-rc8 release.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>