Merge change I71938023

* changes:
  Assert that the incoming thread and monitor objects are not NULL.  The old implementation allowed monitors to be NULL when they were unlocked and otherwise unowned.  With the new lock word format, a NULL monitor object can only mean that an invariant has been lost.  Also, nix some trailing whitespace that crept into a comment.