r4852: merge simo changes to srv_srvsvc_nt.c from trunk