Merge change I5ccdf0be

* changes:
  Fix for "Compiler thread shutdown should switch out of VMWAIT"