hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: 111bda25e0f0
Author:    mcimadamore
Date:      2018-01-11 22:06 +0100
URL:       http://hg.openjdk.java.net/amber/amber/rev/111bda25e0f0

Automatic merge with default

- make/langtools/intellij/runConfigurations/javah.xml
- make/langtools/test/bootstrap/javah.sh
- make/langtools/test/lib/javah.sh
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Enter.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
- src/jdk.compiler/share/classes/com/sun/tools/javac/util/JDK9Wrappers.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CooperativePhaseTest.java
- test/jdk/java/net/httpclient/RequestProcessorExceptions.java
- test/langtools/tools/javac/T6356530/SerializableAbstractClassWithNonAbstractMethodsTest.java
- test/langtools/tools/javac/T6356530/SerializableAbstractClassWithNonAbstractMethodsTest.out
! test/langtools/tools/javac/diags/examples.not-yet.txt