hg: panama/dev: manual merge with default

[vladimir.x.ivanov at oracle.com]

Changeset: 6549e3699526
Author:    vlivanov
Date:      2018-07-13 21:19 +0300
URL:       http://hg.openjdk.java.net/panama/dev/rev/6549e3699526

manual merge with default

! src/hotspot/cpu/x86/methodHandles_x86.cpp
! src/hotspot/share/classfile/javaClasses.cpp
! src/hotspot/share/classfile/javaClasses.hpp
! src/hotspot/share/classfile/systemDictionary.hpp
! src/hotspot/share/classfile/vmSymbols.hpp
! src/hotspot/share/prims/vector.cpp
! src/hotspot/share/runtime/globals.hpp
! src/java.base/share/classes/java/lang/invoke/MethodTypeForm.java
- src/java.base/share/classes/sun/net/NetworkServer.java
- src/java.base/share/classes/sun/net/URLCanonicalizer.java
- test/jdk/java/lang/System/SetProperties.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/types/CastObjectToPrimitiveTest.out