The result of this is that the target jtreg_tests is declared two times, which causes make to protest.
Note that the broken merge is in jdk9/hs, so this is where the fix needs to go.
Bug: https://bugs.openjdk.java.net/browse/JDK-8171163WebRev: http://cr.openjdk.java.net/~ihse/JDK-8171163-borked-merge-on-test-Makefile/webrev.01
/Magnus