hg: amber/amber: manual merge with default

[vicente.romero at oracle.com]

Changeset: 902051a97d9a
Author:    vromero
Date:      2018-05-10 19:25 -0700
URL:       http://hg.openjdk.java.net/amber/amber/rev/902051a97d9a

manual merge with default

! .hgignore
! make/Bundles.gmk
! make/CreateJmods.gmk
! make/Images.gmk
! make/Main.gmk
! make/autoconf/basics.m4
! make/autoconf/spec.gmk.in
! make/copy/Copy-java.base.gmk
- make/launcher/Launcher-java.desktop.gmk
! make/test/JtregNativeHotspot.gmk
- src/bsd/doc/man/appletviewer.1
- src/bsd/doc/man/ja/appletviewer.1
! src/hotspot/cpu/x86/templateTable_x86.cpp
- src/hotspot/share/classfile/sharedClassUtil.cpp
- src/hotspot/share/classfile/sharedClassUtil.hpp
! src/hotspot/share/classfile/systemDictionary.cpp
! src/hotspot/share/classfile/systemDictionary.hpp
- src/hotspot/share/classfile/systemDictionary_ext.hpp
! src/hotspot/share/classfile/vmSymbols.hpp
! src/hotspot/share/interpreter/linkResolver.cpp
! src/hotspot/share/jvmci/vmStructs_jvmci.cpp
! src/hotspot/share/memory/universe.cpp
! src/hotspot/share/prims/jvm.cpp
- src/hotspot/share/runtime/advancedThresholdPolicy.cpp
- src/hotspot/share/runtime/advancedThresholdPolicy.hpp
! src/hotspot/share/runtime/globals.hpp
! src/hotspot/share/runtime/reflection.cpp
- src/hotspot/share/services/metaspaceDCmd.cpp
! src/java.base/share/classes/java/lang/Class.java
! src/java.base/share/classes/java/lang/String.java
! src/java.base/share/classes/module-info.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java
- src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ClassForNamePlugin.java
- src/linux/doc/man/appletviewer.1
- src/linux/doc/man/ja/appletviewer.1
- src/solaris/doc/sun/man/man1/appletviewer.1
- src/solaris/doc/sun/man/man1/ja/appletviewer.1
- test/hotspot/jtreg/compiler/tiered/TransitionsTestExecutor.java
- test/jdk/com/sun/crypto/provider/KeyAgreement/DHGenSecretKey.java
- test/jdk/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.java
- test/jdk/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh
- test/jdk/java/awt/appletviewer/IOExceptionIfEncodedURLTest/test.html
- test/jdk/java/lang/invoke/I4Special.jcod
! test/jdk/java/lang/invoke/condy/CondyRepeatFailedResolution.java
! test/jdk/java/lang/invoke/condy/CondyReturnPrimitiveTest.java
! test/jdk/java/lang/invoke/condy/CondyWrongType.java
! test/jdk/java/lang/invoke/condy/ConstantBootstrapsTest.java
- test/jdk/javax/print/applet/AppletPrintLookup.html
- test/jdk/javax/print/applet/AppletPrintLookup.sh
- test/jdk/javax/print/applet/YesNo.java
- test/jdk/javax/print/applet/applet0/Applet0.java
- test/jdk/javax/print/applet/applet1/Applet1.java
- test/jdk/javax/print/applet/applet1/Applet1PrintService.java
- test/jdk/javax/print/applet/applet1/Applet1PrintServiceLookup.java
- test/jdk/javax/print/applet/applet1/META-INF/services/javax.print.PrintServiceLookup
- test/jdk/javax/print/applet/applet2/Applet2.java
- test/jdk/javax/print/applet/applet2/Applet2PrintService.java
- test/jdk/javax/print/applet/applet2/Applet2PrintServiceLookup.java
- test/jdk/javax/print/applet/applet2/META-INF/services/javax.print.PrintServiceLookup
- test/jdk/javax/print/applet/applet3/Applet3.java
- test/jdk/javax/print/applet/applet3/Applet3PrintService.java
- test/jdk/javax/print/applet/applet4/Applet4.java
- test/jdk/javax/print/applet/applet4/Applet4PrintService.java
- test/jdk/javax/print/applet/applet4/Applet4PrintServiceLookup.java