hg: jdk/sandbox: Merge

[bradford.wetmore at oracle.com]

Changeset: 902afa0f37f9
Author:    wetmore
Date:      2018-05-25 14:24 -0700
URL:       http://hg.openjdk.java.net/jdk/sandbox/rev/902afa0f37f9

Merge

- src/hotspot/share/jfr/metadata/GenerateJfrFiles.java