[8u20] RFR (M) 8042786: Proper fix for 8032566

[Vladimir Kozlov]

8u20 backport request. The fix was pushed into jdk9 5 days ago and 
nightly testing shows no problems.

Changes from jdk9 applied to 8u without conflicts.

http://cr.openjdk.java.net/~kvn/8042786/webrev/
https://bugs.openjdk.java.net/browse/JDK-8042786
http://hg.openjdk.java.net/jdk9/hs-comp/hotspot/rev/13818eb5243c

Thanks,
Vladimir