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

[maurizio.cimadamore at oracle.com]

Changeset: a34b095d55db
Author:    langtools
Date:      2017-04-22 02:57 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/a34b095d55db

Automatic merge with default

! src/java.base/share/classes/java/lang/Integer.java
! src/java.base/share/classes/java/lang/Long.java
! src/java.base/share/classes/java/lang/String.java
- test/java/net/MulticastSocket/JoinGroup.java
- test/java/net/MulticastSocket/Leave.java