Updates ZEN-9726

Adds in changes from txwinrm and pykerberos.