Please review JDK-8066238

[Andreas Gabrielsson]

Bug report at: https://bugs.openjdk.java.net/browse/JDK-8066238
Webrev at: http://cr.openjdk.java.net/~agabrielsson/8066238/webrev/

Regards
Andreas Gabrielsson