Manually merge Steven Danneman's patch for SPNEGO auth to a trusted