hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: eb4133a48ca2
Author:    mcimadamore
Date:      2017-11-23 22:06 +0100
URL:       http://hg.openjdk.java.net/amber/amber/rev/eb4133a48ca2

Automatic merge with default

- 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/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.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/TagletWriterImpl.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/BaseConfiguration.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MemberSummaryBuilder.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
- test/langtools/tools/javadoc/sourceOnly/p/NonSource.class