am 1444f86: Merge change 945 into donut

Merge commit '1444f86148b2844800044b4776e2a35d362f3fa9'

* commit '1444f86148b2844800044b4776e2a35d362f3fa9':
  Moved the context class loader init down a bit to ensure proper init.