hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: 198fcfd16db1
Author:    mcimadamore
Date:      2019-10-15 05:10 +0000
URL:       https://hg.openjdk.java.net/amber/amber/rev/198fcfd16db1

Automatic merge with default

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