hg: jdk/sandbox: Merge

[alan.bateman at oracle.com]

Changeset: 67c102efba4b
Author:    alanb
Date:      2019-03-30 09:30 +0000
URL:       http://hg.openjdk.java.net/jdk/sandbox/rev/67c102efba4b

Merge

! src/java.base/share/classes/java/net/ServerSocket.java
! src/java.base/share/classes/java/net/Socket.java
- test/hotspot/jtreg/runtime/containers/docker/Dockerfile-BasicTest
- test/hotspot/jtreg/runtime/containers/docker/Dockerfile-BasicTest-aarch64
- test/hotspot/jtreg/runtime/containers/docker/Dockerfile-BasicTest-ppc64le
- test/hotspot/jtreg/runtime/containers/docker/Dockerfile-BasicTest-s390x
- test/hotspot/jtreg/runtime/handshake/HandshakeWalkSuspendExitTest.java
! test/jdk/java/net/Socket/Timeouts.java
- test/jdk/jdk/internal/platform/docker/Dockerfile-BasicTest
- test/jdk/jdk/internal/platform/docker/Dockerfile-BasicTest-aarch64
- test/jdk/jdk/internal/platform/docker/Dockerfile-BasicTest-ppc64le
- test/jdk/jdk/internal/platform/docker/Dockerfile-BasicTest-s390x