hg: amber/amber: Automatic merge with condy

[maurizio.cimadamore at oracle.com]

Changeset: 852deed3360d
Author:    mcimadamore
Date:      2017-11-02 22:05 +0100
URL:       http://hg.openjdk.java.net/amber/amber/rev/852deed3360d

Automatic merge with condy

! src/java.base/share/classes/java/lang/String.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
- test/langtools/tools/javac/diags/examples/PatchModuleWithRelease/PatchModuleWithRelease.java
- test/langtools/tools/javac/diags/examples/PatchModuleWithRelease/patchmodule/java.base/java/lang/Test.java