8191069: Miscellaneous changes imported from jsr166 CVS 2017-12

Reviewed-by: martin, psandoz

test/jdk/java/util/concurrent/tck/StampedLockTest.java

@@ -614,7 +614,7 @@ public class StampedLockTest extends JSR166TestCase {
         long s = lock.readLock();
         Thread t = newStartedThread(new CheckedRunnable() {
             public void realRun() {
-                threadAssertEquals(0L, lock.tryWriteLock());
+                assertEquals(0L, lock.tryWriteLock());
             }});
 
         awaitTermination(t);