hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: 522318d3a6cf
Author:    mcimadamore
Date:      2019-01-23 20:48 +0100
URL:       http://hg.openjdk.java.net/amber/amber/rev/522318d3a6cf

Automatic merge with default

- src/hotspot/share/gc/g1/evacuationInfo.hpp
- src/java.base/unix/native/libnio/ch/SocketChannelImpl.c
- src/java.base/unix/native/libnio/ch/SocketDispatcher.c
- src/java.base/windows/native/libnio/ch/SocketChannelImpl.c
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
- test/jdk/javax/net/ssl/compatibility/Parameter.java
- test/jdk/sun/security/util/Resources/NewNamesFormat.java
- test/jdk/sun/security/util/Resources/NewResourcesNames.java
- test/langtools/jdk/javadoc/doclet/testHtmlLandmarkRegions/TestHtmlLankmarkRegions.java