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

[maurizio.cimadamore at oracle.com]

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

Automatic merge with default

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