hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: 41f82e3ae0fd
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-02 00:41 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/41f82e3ae0fd

Automatic merge with default

- test/lib/jdk/test/lib/wrappers/InfiniteLoop.java
- test/lib/jdk/test/lib/wrappers/TimeLimitedRunner.java