hg: amber/amber: manual merge with default

[vicente.romero at oracle.com]

Changeset: 1e619a1781a5
Author:    vromero
Date:      2018-09-13 13:48 -0700
URL:       http://hg.openjdk.java.net/amber/amber/rev/1e619a1781a5

manual merge with default

! make/autoconf/spec.gmk.in
- make/jdk/src/classes/build/tools/hasher/Hasher.java
- make/jdk/src/classes/build/tools/jarreorder/JarReorder.java
- make/mapfiles/libjsig/mapfile-vers-solaris
- make/mapfiles/libjsound/mapfile-vers
- make/mapfiles/libjvm_db/mapfile-vers
- make/mapfiles/libjvm_dtrace/mapfile-vers
! src/hotspot/share/classfile/systemDictionary.hpp
! src/hotspot/share/oops/klass.hpp
- src/hotspot/share/utilities/globalDefinitions_sparcWorks.hpp
- src/java.desktop/windows/native/common/awt_makecube.cpp
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
! src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java
- test/hotspot/jtreg/vmTestbase/nsk/share/test/timeoutwatchdog/TimeoutHandler.java
- test/hotspot/jtreg/vmTestbase/nsk/share/test/timeoutwatchdog/TimeoutWatchdog.java
- test/hotspot/jtreg/vmTestbase/vm/share/gc/TriggerUnloadingByFillingHeap.java
- test/hotspot/jtreg/vmTestbase/vm/share/vmstresser/CompileAndDeoptimize.java
- test/hotspot/jtreg/vmTestbase/vm/share/vmstresser/MetaspaceStresser.java
- test/jdk/com/sun/jdi/GetLocalVariables4Test.sh
- test/jdk/com/sun/jdi/JdbArgTest.sh
- test/jdk/com/sun/jdi/JdbLockTest.sh
- test/jdk/com/sun/jdi/JdbMissStep.sh
- test/jdk/com/sun/jdi/JdbVarargsTest.sh
- test/jdk/com/sun/jdi/MixedSuspendTest.sh
- test/jdk/com/sun/jdi/NotAField.sh
- test/jdk/com/sun/jdi/NullLocalVariable.sh
- test/jdk/com/sun/jdi/Redefine-g.sh
- test/jdk/com/sun/jdi/RedefineAbstractClass.sh
- test/jdk/com/sun/jdi/RedefineAddPrivateMethod.sh
- test/jdk/com/sun/jdi/RedefineAnnotation.sh
- test/jdk/com/sun/jdi/RedefineChangeClassOrder.sh
- test/jdk/com/sun/jdi/RedefineClasses.sh
- test/jdk/com/sun/jdi/RedefineClearBreakpoint.sh
- test/jdk/com/sun/jdi/RedefineImplementor.sh
- test/jdk/java/util/zip/ZipFile/deletetempjar.sh
- test/jdk/javax/naming/module/basic.sh
- test/jdk/jdk/internal/reflect/Reflection/GetCallerClassTest.sh
- test/jdk/lib/testlibrary/jdk/testlibrary/JDKToolFinder.java
- test/jdk/lib/testlibrary/jdk/testlibrary/JDKToolLauncher.java
- test/jdk/lib/testlibrary/jdk/testlibrary/OSInfo.java
- test/jdk/lib/testlibrary/jdk/testlibrary/OutputAnalyzer.java
- test/jdk/lib/testlibrary/jdk/testlibrary/OutputBuffer.java
- test/jdk/lib/testlibrary/jdk/testlibrary/ProcessTools.java
- test/jdk/lib/testlibrary/jdk/testlibrary/StreamPumper.java
! test/langtools/tools/javac/diags/examples.not-yet.txt