Merge 4.18-rc7 into master to pick up the KVM dependcy