hg: amber/amber/langtools: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: 3b7b068d8943
Author:    langtools
Date:      2017-04-13 23:56 +0200
URL:       http://hg.openjdk.java.net/amber/amber/langtools/rev/3b7b068d8943

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