[#2004] Server properties now looks for both KerberosServicePrincipal and KerberosKeytab. When it find the KerberosKeytab it also sets the KRB5_KTNAME environment variable which kerberos will refer to.
Merge with master