[9] and [8u40] ports RFR (S): 8049542 and 8054530

[Vladimir Kozlov]

Request to forward port fixes we did only in 7u. Fixes were done 2 
months ago. Changes are applied cleanly.

http://cr.openjdk.java.net/~morris/8054530.02/
https://bugs.openjdk.java.net/browse/JDK-8054530
http://hg.openjdk.java.net/jdk7u/jdk7u-dev/hotspot/rev/612e0c2ebea4

http://cr.openjdk.java.net/~kvn/8049542/webrev
https://bugs.openjdk.java.net/browse/JDK-8049542
http://hg.openjdk.java.net/jdk7u/jdk7u-dev/hotspot/rev/16f41a7c5c28

Thanks,
Vladimir