Merge changes I8cc87bac,If1a92e47

* changes:
  Cleanup jvmti tests
  Revert "Revert "Basic obsolete methods support""