hg: amber/amber: manual merge with default

[vicente.romero at oracle.com]

Changeset: 385786dcc4ef
Author:    vromero
Date:      2018-11-27 16:48 -0500
URL:       http://hg.openjdk.java.net/amber/amber/rev/385786dcc4ef

manual merge with default

! src/hotspot/share/classfile/systemDictionary.hpp
! src/hotspot/share/prims/jvm.cpp
! src/jdk.compiler/share/classes/com/sun/source/doctree/DocTree.java
! src/jdk.compiler/share/classes/com/sun/source/doctree/DocTreeVisitor.java
! src/jdk.compiler/share/classes/com/sun/source/util/DocTreeFactory.java
! src/jdk.compiler/share/classes/com/sun/source/util/DocTreeScanner.java
! src/jdk.compiler/share/classes/com/sun/source/util/SimpleDocTreeVisitor.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/parser/DocCommentParser.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DCTree.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocPretty.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocTreeMaker.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TagletWriterImpl.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletManager.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletWriter.java
- test/jdk/java/lang/System/ClearProperty.java
- test/jdk/java/lang/System/SetPropertiesNull.java
! test/langtools/tools/javac/doctree/DocCommentTester.java