[Bug 225974] Merge Review: krb5