Review request for JDK-8071928 and JDK-8073846

[Hannes Wallnoefer]

Please review JDK-8071928 and JDK-8073846:

http://cr.openjdk.java.net/~hannesw/8071928/
http://cr.openjdk.java.net/~hannesw/8073846/
These are two test-only commits for bugs that are already fixed in both 
JDK9 and 8u60.

Thanks,
Hannes