Merge "Fix incorrect test counts when filtering JUnit3 tests."