hg: amber/amber: manual merge

[maurizio.cimadamore at oracle.com]

Changeset: 44c9d8007630
Author:    mcimadamore
Date:      2017-12-01 11:34 +0000
URL:       http://hg.openjdk.java.net/amber/amber/rev/44c9d8007630

manual merge

- src/hotspot/share/classfile/jimage.hpp
- src/jdk.charsets/share/classes/sun/nio/cs/ext/MS950_HKSCS.java
! 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/code/Types.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/parser/DocCommentParser.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
! 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/toolkit/BaseConfiguration.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/CommentUtils.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletManager.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java
- test/jdk/java/lang/SecurityManager/NoAWT.java
- test/jdk/jdk/internal/util/jar/TestVersionedStream.java
! test/langtools/tools/javac/doctree/DocCommentTester.java
- test/langtools/tools/javac/doctree/dcapi/OverviewTest.java
! test/langtools/tools/javac/lib/DPrinter.java