RFR: JDK8U Backport of JDK-8042131 and JDK-8210633

[Langer, Christoph]

Hi Deepak,

> Thanks for review. I think Naoto and Ramanand are right, we do update the
> copyright year when it is not a clean backport. Please find the updated
> version of webrev.
> 
> http://cr.openjdk.java.net/~rpatil/8042131_8210633/webrev.01/

Ok, you are right... Still wondering, whether in the test the copyright year should be 2012, 2019, since it is very much derived from the upstream version. But in the end, I don't want to bikeshed. All good for me ��

Thanks
Christoph