[8u-dev] equest for approval: JDK-8065267 backport of JDK-8028497 and JDK-8036614

[Henry Jen]

Hi,

This had been asked for several times, so I think we should backport it. 
I combined both changes as one backport of main bug, JDK-8028497.

http://cr.openjdk.java.net/~henryjen/8065267/webrev/

Cheers,
Henry