Merge change 944 into donut

* changes:
  Set the main thread's context class loader to the system class loader.