hg: amber/amber: manual merge

[maurizio.cimadamore at oracle.com]

Changeset: f12a3b2f331e
Author:    mcimadamore
Date:      2017-12-06 11:46 +0000
URL:       http://hg.openjdk.java.net/amber/amber/rev/f12a3b2f331e

manual merge

- src/java.base/share/classes/jdk/internal/util/jar/VersionedStream.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/TransTypes.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.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
- test/jdk/jdk/internal/misc/JavaLangAccess/NewUnsafeString.java
- test/langtools/tools/javac/6302184/T6302184.java
- test/langtools/tools/javac/6302184/T6302184.out