Fixed issue with kerberos reauth on win32
Fixed merge issues