[8u40] RFR (S): Missing part of 8057656 in 8u40 compared to 9

[Vladimir Ivanov]

http://cr.openjdk.java.net/~vlivanov/8058626/webrev.00/
https://bugs.openjdk.java.net/browse/JDK-8058626

I've noticed a difference between 8057656 fixes in 8u-dev [1] and 9 [2].
It seems I integrated [3] into 8u and [4] into 9.
This change syncs 8u to 9.

Thanks!

Best regards,
Vladimir Ivanov

[1] http://hg.openjdk.java.net/jdk8u/jdk8u-dev/jdk/rev/4b2bc06d521c
[2] http://hg.openjdk.java.net/jdk9/dev/jdk/rev/5ae5da7305a8
[3] http://cr.openjdk.java.net/~vlivanov/8057656/webrev.00/
[4] http://cr.openjdk.java.net/~vlivanov/8057656/webrev.01/