RFR: 8030016 & 8029055: (forward ports to jdk 9)

[Mike Duigou]

Hello all;

These two changesets were committed to JDK 8 forest. I wish to commit the same changes to JDK 9.

http://hg.openjdk.java.net/jdk8/tl/jdk/rev/26028cb56c68
http://hg.openjdk.java.net/jdk8/tl/jdk/rev/a7ed72627c3f

Mike