hg: amber/amber: manual merge with default

[vicente.romero at oracle.com]

Changeset: 738e9ab393f2
Author:    vromero
Date:      2018-07-12 13:57 -0700
URL:       http://hg.openjdk.java.net/amber/amber/rev/738e9ab393f2

manual merge with default

! make/autoconf/spec.gmk.in
! make/hotspot/symbols/symbols-unix
! src/hotspot/share/classfile/systemDictionary.hpp
! src/hotspot/share/classfile/vmSymbols.hpp
! src/hotspot/share/include/jvm.h
! src/hotspot/share/prims/jvm.cpp
- src/java.base/share/classes/sun/net/NetworkServer.java
- src/java.base/share/classes/sun/net/URLCanonicalizer.java
! 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/comp/Attr.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.hotspot.agent/share/classes/sun/jvm/hotspot/memory/AltHashing.java
- src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/SymbolTable.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties
- test/hotspot/jtreg/runtime/SharedArchiveFile/SASymbolTableTest.java
- test/hotspot/jtreg/runtime/SharedArchiveFile/SASymbolTableTestAgent.java
- test/hotspot/jtreg/serviceability/sa/ClhsdbSymbol.java
- test/hotspot/jtreg/serviceability/sa/ClhsdbSymbolTable.java
- test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach024/java.base/java/util/ServiceConfigurationError.java
- test/jdk/java/lang/System/SetProperties.java
- test/jdk/sun/tools/jhsdb/AlternateHashingTest.java
- test/jdk/sun/tools/jhsdb/LingeredAppWithAltHashing.java
- test/langtools/tools/javac/6558548/T6558548_6.out
- test/langtools/tools/javac/8013179/T8013179.java
- test/langtools/tools/javac/8013179/T8013179.out
- test/langtools/tools/javac/StringsInSwitch/BadlyTypedLabel1_6.out
- test/langtools/tools/javac/StringsInSwitch/BadlyTypedLabel2_6.out
- test/langtools/tools/javac/StringsInSwitch/NonConstantLabel6.out
- test/langtools/tools/javac/StringsInSwitch/OneCaseSwitches.out
- test/langtools/tools/javac/StringsInSwitch/RSCL1_6.out
- test/langtools/tools/javac/StringsInSwitch/RSCL2_6.out
- test/langtools/tools/javac/TryWithResources/BadTwr6.out
- test/langtools/tools/javac/TryWithResources/BadTwrSyntax6.out
- test/langtools/tools/javac/TryWithResources/PlainTry6.out
- test/langtools/tools/javac/TryWithResources/TwrOnNonResource6.out
- test/langtools/tools/javac/annotations/repeatingAnnotations/WrongVersion6.out
- test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion.out
- test/langtools/tools/javac/defaultMethods/static/StaticInvokeQualified6.out
- test/langtools/tools/javac/defaultMethods/static/StaticInvokeSimple6.out
- test/langtools/tools/javac/literals/BadBinaryLiterals.6.out
- test/langtools/tools/javac/literals/BadUnderscoreLiterals.6.out
! test/langtools/tools/javac/parser/JavacParserTest.java
- test/langtools/tools/javac/types/CastObjectToPrimitiveTest.out