Merge changes I5b05e23a,I9350b250,I1d66b42a

* changes:
  More refactor for JVMTI redefinition run tests (3/3)
  More refactor for JVMTI redefinition run tests (2/3)
  More refactor for JVMTI redefinition run tests (1/3)