Merge in workaround for broken Kerberos 10.x gssapi.h