hg: amber/amber/jdk: Automatic merge with condy

[maurizio.cimadamore at oracle.com]

Changeset: 5498a34df4fe
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-08-11 12:52 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/5498a34df4fe

Automatic merge with condy

! src/java.base/share/classes/java/lang/Double.java
! src/java.base/share/classes/java/lang/Float.java
! src/java.base/share/classes/java/lang/String.java
- src/java.base/share/classes/jdk/internal/module/SystemModuleFinder.java
- src/java.base/share/classes/sun/net/www/protocol/https/DefaultHostnameVerifier.java
- src/java.base/share/classes/sun/util/locale/LocaleEquivalentMaps.java
- test/java/lang/ClassLoader/deadlock/Alice.java
- test/java/lang/ClassLoader/deadlock/Bob.java
- test/java/lang/ClassLoader/deadlock/Starter.java
- test/java/lang/ClassLoader/deadlock/SupAlice.java
- test/java/lang/ClassLoader/deadlock/SupBob.java
- test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh
- test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh
- test/java/lang/ClassLoader/getResource/GetResource.sh
- test/java/util/Locale/tools/EquivMapsGenerator.java
- test/java/util/Locale/tools/language-subtag-registry.txt
- test/tools/launcher/modules/patch/systemmodules/src1/java.base/jdk/internal/modules/SystemModules.java