Add an options to use a CallbackHandler + service name form switch with KerberosClient
Recording .gitmergeinfo Changes