hg: amber/amber: manual merge with default

[vicente.romero at oracle.com]

Changeset: 2d6e9344cc97
Author:    vromero
Date:      2017-12-05 22:57 -0500
URL:       http://hg.openjdk.java.net/amber/amber/rev/2d6e9344cc97

manual merge with default

- src/java.base/share/classes/jdk/internal/util/jar/VersionedStream.java
! src/jdk.compiler/share/classes/com/sun/source/doctree/DocTreeVisitor.java
! src/jdk.compiler/share/classes/com/sun/source/util/SimpleDocTreeVisitor.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacElements.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.jshell/share/classes/jdk/jshell/CompletenessAnalyzer.java
! src/jdk.jshell/share/classes/jdk/jshell/ReplParser.java
- test/jdk/jdk/internal/misc/JavaLangAccess/NewUnsafeString.java
- test/langtools/tools/javac/6302184/T6302184.java
- test/langtools/tools/javac/6302184/T6302184.out
! test/langtools/tools/javac/diags/examples.not-yet.txt
! test/langtools/tools/javac/parser/extend/TrialParser.java