[9] RFR 8033757: Redo JDK-8011983 (due to bad merge with JDK-8031586)

[Vincent Ryan]

My fix for JDK-8011983 trampled on the fix for JDK-8031568 in:
  jdk/src/windows/native/com/sun/security/auth/module/nt.c

This change merges both of those changes.

Webrev: http://cr.openjdk.java.net/~vinnie/8033757/webrev.00/

Thanks.