Merge changes Ibaed6a7e,I1c89537c

* changes:
  Correct behavior of thread suspension around Raw monitors
  Ensure shutdown thread has a java peer.