merge of negoex branch
Merge branch 'lhoward/negoex' of github.com:PADL/krb5 into lhoward/negoex

Conflicts:
	src/lib/gssapi/negoex/negoex_ctx.c
use bigger timeout
fix NegoEx verification with two token exchange