Integrated: Resolved merge conflict caused by CODETOOLS-7902876

[Leonid Kuskov]

This is the fix to remove the merge conflict caused by the CODETOOLS-7902876 integration

-------------

Commit messages:
 - Resolved merge conflict caused by CODETOOLS-7902876
 - 7902876: Cleanup Instr tool
 - Instrumentation plugin concept
 - 7902764: RepGen: Javap mode doesn't support classes that have no package
 - 7902724: jcov ignores covariant method overriding while gathering a methods coverages
 - Merge remote-tracking branch 'upstream/master'
 - 7902819: jcov fails to instrument JDKs records
 - Merge branch 'master' into CODETOOLS-7902823
 - 7902823: RepGen fails with IllegalFormatArgumentIndexException if started by JDK 16 and above
 - Merge remote-tracking branch 'upstream/master'
 - ... and 9 more: https://git.openjdk.java.net/jcov/compare/e847caf0...447c42c9

Changes: https://git.openjdk.java.net/jcov/pull/13/files
 Webrev: https://webrevs.openjdk.java.net/?repo=jcov&pr=13&range=00
  Stats: 11 lines in 4 files changed: 0 ins; 5 del; 6 mod
  Patch: https://git.openjdk.java.net/jcov/pull/13.diff
  Fetch: git fetch https://git.openjdk.java.net/jcov pull/13/head:pull/13

PR: https://git.openjdk.java.net/jcov/pull/13