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

[maurizio.cimadamore at oracle.com]

Changeset: f95285563b00
Author:    mcimadamore
Date:      2019-03-26 21:40 +0100
URL:       http://hg.openjdk.java.net/amber/amber/rev/f95285563b00

Automatic merge with patterns-stage-1

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