r3379: More merging of kerberos keytab and salting fixes from Nalin Dahyabhai <nalin...