hg: amber/amber: manual merge

[maurizio.cimadamore at oracle.com]

Changeset: 76c3bdfd7666
Author:    mcimadamore
Date:      2017-11-23 21:12 +0000
URL:       http://hg.openjdk.java.net/amber/amber/rev/76c3bdfd7666

manual merge

! make/Init.gmk
! make/RunTests.gmk
! make/autoconf/generated-configure.sh
! make/test/JtregNativeHotspot.gmk
! src/hotspot/cpu/x86/interp_masm_x86.cpp
! src/hotspot/cpu/x86/macroAssembler_x86.cpp
! src/hotspot/cpu/x86/templateTable_x86.cpp
- src/hotspot/share/gc/g1/g1MarkSweep.cpp
- src/hotspot/share/gc/g1/g1MarkSweep.hpp
- src/hotspot/share/gc/g1/g1MarkSweep_ext.cpp
- src/hotspot/share/gc/g1/g1RemSet.inline.hpp
- src/hotspot/share/gc/g1/g1SerialFullCollector.cpp
- src/hotspot/share/gc/g1/g1SerialFullCollector.hpp
! src/hotspot/share/interpreter/bytecodeInterpreter.cpp
! src/hotspot/share/memory/universe.cpp
! src/hotspot/share/memory/universe.hpp
! src/hotspot/share/runtime/globals.hpp
! src/java.base/share/classes/java/lang/invoke/MethodHandles.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TableHeader.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlDocWriter.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlWriter.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/GroupTypes.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/MethodTypes.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ModulePackageTypes.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/TableTabTypes.java
! src/jdk.jdeps/share/classes/com/sun/tools/javap/ConstantWriter.java
- test/langtools/tools/javadoc/sourceOnly/p/NonSource.class