Merge changes I16fde69b,I6c085137 into pi-dev

* changes:
  Add arg for overwriting class loader class path
  Add stored class loader context option