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

[maurizio.cimadamore at oracle.com]

Changeset: b4aca7a54700
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-05-18 20:20 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/b4aca7a54700

Automatic merge with default

- test/lib/testlibrary/jdk/testlibrary/FilterClassLoader.java
- test/lib/testlibrary/jdk/testlibrary/ParentLastURLClassLoader.java