hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: 6240d720e585
Author:    mcimadamore
Date:      2017-11-30 22:05 +0100
URL:       http://hg.openjdk.java.net/amber/amber/rev/6240d720e585

Automatic merge with default

- 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/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/java/lang/SecurityManager/NoAWT.java
- test/jdk/jdk/internal/util/jar/TestVersionedStream.java
- test/langtools/tools/javac/doctree/dcapi/OverviewTest.java