More work on krb5 crypto merge