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

[maurizio.cimadamore at oracle.com]

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

Automatic merge with default

- test/java/net/MulticastSocket/JoinGroup.java
- test/java/net/MulticastSocket/Leave.java