hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: cda699d0e6fa
Author:    mcimadamore
Date:      2017-12-05 23:05 +0100
URL:       http://hg.openjdk.java.net/amber/amber/rev/cda699d0e6fa

Automatic merge with default

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