more backported fixes for keytab-doesn't-have-all-key-types cases
    
    - add a backport of more patches to set the client's list of supported enctypes
      when using a keytab to be the list of types of keys in the keytab, plus the
      list of other types the client supports but for which it doesn't have keys,
      in that order, so that KDCs have a better chance of being able to issue
      tickets with session keys of types that the client can use (#837855)