Merge branch 'kvm-lapic-fix-and-cleanup' into HEAD