[8u] Request for approval: 8035165, 8049057

[Sergey Bylokhov]

Hello,
These are a direct back-ports from jdk 9 to jdk 8u.

Bug: https://bugs.openjdk.java.net/browse/JDK-8035165
jdk9 changeset: http://hg.openjdk.java.net/jdk9/client/jdk/rev/028e3ede1880
Reviewers: Phil Race, Petr Pchelko

Bug: https://bugs.openjdk.java.net/browse/JDK-8049057
jdk9 changeset: http://hg.openjdk.java.net/jdk9/client/jdk/rev/70da00f18d98
Reviewers: Phil Race, Petr Pchelko

-- 
Best regards, Sergey.