Merge change 7550

* changes:
  Fixing wakeups caused by Thread.join() interacting with LockSupport.unpark.