hg: jdk9/sandbox/hotspot: Merge

[magnus.ihse.bursie at oracle.com]

Changeset: a6502f663e35
Author:    ihse
Date:      2017-06-12 08:49 +0200
URL:       http://hg.openjdk.java.net/jdk9/sandbox/hotspot/rev/a6502f663e35

Merge

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