hg: amber/amber/hotspot: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: f231fa912d6f
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-05-26 16:35 +0200
URL:       http://hg.openjdk.java.net/amber/amber/hotspot/rev/f231fa912d6f

Automatic merge with default

- make/templates/gpl-cp-header
- make/templates/gpl-header