Merge branch 'kvm-vmx-secctl' into HEAD