hg: jdk9/sandbox/jdk: Merge

[tobias.hartmann at oracle.com]

Changeset: 40e2fb62652f
Author:    thartmann
Date:      2015-10-30 18:24 +0100
URL:       http://hg.openjdk.java.net/jdk9/sandbox/jdk/rev/40e2fb62652f

Merge

! src/java.base/share/classes/java/lang/String.java