Merge change 2454 into donut

* changes:
  Reactivating tests disabled because of ClassLoader loop