URGENT [8u60] Backport: 8053902: Fix for 8030115 breaks build on Windows and Solaris

[David Holmes]

Please approve the direct backport of this fix to JDK 8u-dev as it is 
causing build failures.

The bug: https://bugs.openjdk.java.net/browse/JDK-8053902

The review thread ... well I couldn't actually find a review thread as 
such, only this notification:

http://mail.openjdk.java.net/pipermail/serviceability-dev/2014-July/015286.html

The JDK 9 changeset:

http://hg.openjdk.java.net/jdk9/dev/jdk/rev/2b1a17af5308

Thanks,
David