hg: amber/amber: manual merge with default

[vicente.romero at oracle.com]

Changeset: 3532b9384a41
Author:    vromero
Date:      2018-06-14 14:58 -0700
URL:       http://hg.openjdk.java.net/amber/amber/rev/3532b9384a41

manual merge with default

! make/autoconf/spec.gmk.in
- src/java.base/aix/native/libjsig/jsig.c
- src/java.desktop/macosx/native/libsplashscreen/libpng/zlib.h
- src/java.desktop/share/classes/sun/applet/AppletEvent.java
- src/java.desktop/share/classes/sun/applet/AppletEventMulticaster.java
- src/java.desktop/share/classes/sun/applet/AppletIOException.java
- src/java.desktop/share/classes/sun/applet/AppletIllegalArgumentException.java
- src/java.desktop/share/classes/sun/applet/AppletImageRef.java
- src/java.desktop/share/classes/sun/applet/AppletListener.java
- src/java.desktop/share/classes/sun/applet/AppletMessageHandler.java
- src/java.desktop/share/classes/sun/applet/AppletObjectInputStream.java
- src/java.desktop/share/classes/sun/applet/AppletPanel.java
- src/java.desktop/share/classes/sun/applet/AppletProps.java
- src/java.desktop/share/classes/sun/applet/AppletResourceLoader.java
- src/java.desktop/share/classes/sun/applet/AppletSecurityException.java
- src/java.desktop/share/classes/sun/applet/AppletViewer.java
- src/java.desktop/share/classes/sun/applet/AppletViewerFactory.java
- src/java.desktop/share/classes/sun/applet/AppletViewerPanel.java
- src/java.desktop/share/classes/sun/applet/Main.java
- src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer.java
- src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_de.java
- src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_es.java
- src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_fr.java
- src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_it.java
- src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_ja.java
- src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_ko.java
- src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_pt_BR.java
- src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_sv.java
- src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_zh_CN.java
- src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_zh_TW.java
- src/java.desktop/share/classes/sun/print/DialogOnTop.java
- src/java.desktop/share/classes/sun/print/DialogOwner.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.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/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/TreeInfo.java
- test/hotspot/jtreg/runtime/containers/docker/CPUSetsReader.java
- test/hotspot/jtreg/runtime/containers/docker/Common.java
- test/hotspot/jtreg/serviceability/tmtools/jstat/utils/ClassLoadUtils.java
- test/hotspot/jtreg/serviceability/tmtools/jstat/utils/GeneratingClassLoader.java
- test/hotspot/jtreg/serviceability/tmtools/jstat/utils/TemplateClass.java
- test/hotspot/jtreg/vmTestbase/heapdump/JMapHeap/TEST.properties
- test/hotspot/jtreg/vmTestbase/heapdump/JMapHeap/TestDescription.java
- test/hotspot/jtreg/vmTestbase/heapdump/JMapHeap/run.sh
- test/hotspot/jtreg/vmTestbase/heapdump/JMapHeapCore/TestDescription.java
- test/hotspot/jtreg/vmTestbase/heapdump/JMapHeapCore/run.sh
- test/hotspot/jtreg/vmTestbase/heapdump/JMapMetaspace/TEST.properties
- test/hotspot/jtreg/vmTestbase/heapdump/JMapMetaspace/TestDescription.java
- test/hotspot/jtreg/vmTestbase/heapdump/JMapMetaspace/run.sh
- test/hotspot/jtreg/vmTestbase/heapdump/JMapMetaspaceCore/TEST.properties
- test/hotspot/jtreg/vmTestbase/heapdump/JMapMetaspaceCore/TestDescription.java
- test/hotspot/jtreg/vmTestbase/heapdump/JMapMetaspaceCore/run.sh
- test/hotspot/jtreg/vmTestbase/heapdump/OnOOMToFile/TEST.properties
- test/hotspot/jtreg/vmTestbase/heapdump/OnOOMToFile/TestDescription.java
- test/hotspot/jtreg/vmTestbase/heapdump/OnOOMToFile/run.sh
- test/hotspot/jtreg/vmTestbase/heapdump/OnOOMToFileMetaspace/TEST.properties
- test/hotspot/jtreg/vmTestbase/heapdump/OnOOMToFileMetaspace/TestDescription.java
- test/hotspot/jtreg/vmTestbase/heapdump/OnOOMToFileMetaspace/run.sh
- test/hotspot/jtreg/vmTestbase/heapdump/OnOOMToPath/TEST.properties
- test/hotspot/jtreg/vmTestbase/heapdump/OnOOMToPath/TestDescription.java
- test/hotspot/jtreg/vmTestbase/heapdump/OnOOMToPath/run.sh
- test/hotspot/jtreg/vmTestbase/heapdump/README
- test/hotspot/jtreg/vmTestbase/heapdump/share/EatMemory.java
- test/hotspot/jtreg/vmTestbase/heapdump/share/common.sh
- test/jdk/java/lang/Thread/StopThrowable.java
- test/jdk/javax/swing/JLayer/8041982/cupanim.gif
- test/jdk/javax/swing/JSlider/4987336/cupanim.gif
- test/jdk/sun/applet/DeprecatedAppletViewer/DeprecatedAppletViewer.java
- test/jdk/sun/applet/TEST.properties