Add the ability to specify a Kerberos OID Service NameType
Recording .gitmergeinfo Changes