Merge "Disable KVM at limestone (again)"