Merge change 945 into donut

* changes:
  Moved the context class loader init down a bit to ensure proper init.