hg: amber/amber: Automatic merge with patterns-stage-1

[maurizio.cimadamore at oracle.com]

Changeset: 625ce37ae598
Author:    mcimadamore
Date:      2019-06-07 17:07 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/625ce37ae598

Automatic merge with patterns-stage-1

! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties