Backport fix for RT#7858
    
    - spnego: pull in patch from master to restore preserving the OID of the
      mechanism the initiator requested when we have multiple OIDs for the
      same mechanism, so that we reply using the same mechanism OID and the
      initiator doesn't get confused (#1066000, RT#7858)