hg: jdk10/sandbox/hotspot: Merge

[ashipile at redhat.com]

Changeset: f9acfa6ce297
Author:    shade
Date:      2017-05-29 10:24 +0200
URL:       http://hg.openjdk.java.net/jdk10/sandbox/hotspot/rev/f9acfa6ce297

Merge

- make/templates/gpl-cp-header
- make/templates/gpl-header
! src/share/vm/c1/c1_LIRGenerator.cpp
! src/share/vm/runtime/arguments.cpp
! src/share/vm/runtime/globals.hpp