Fix two other tests to treat both old and new JSpecify packages the same

compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/JavaTypeEnhancementStateParser.kt

@@ -58,6 +58,7 @@ class JavaTypeEnhancementStateParser(
 
         return JavaTypeEnhancementState(jsr305Settings) {
             when {
+                it.isSubpackageOf(JSPECIFY_OLD_ANNOTATIONS_PACKAGE) -> jspecifyReportLevel
                 it.isSubpackageOf(JSPECIFY_ANNOTATIONS_PACKAGE) -> jspecifyReportLevel
                 it.isSubpackageOf(CHECKER_FRAMEWORK_COMPATQUAL_ANNOTATIONS_PACKAGE) -> compatqualCheckerFrameworkAnnotationsReportLevel
                 else -> getReportLevelForAnnotation(it, nullabilityAnnotationReportLevels, kotlinVersion)

compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmForeignAnnotationsConfigurator.kt

@@ -60,7 +60,10 @@ open class JvmForeignAnnotationsConfigurator(testServices: TestServices) : Envir
         }.toMap()
         val configuredReportLevels = NullabilityAnnotationStatesImpl(
             buildMap<FqName, ReportLevel> {
-                directives.singleOrZeroValue(JSPECIFY_STATE)?.let { put(JSPECIFY_ANNOTATIONS_PACKAGE, it) }
+                directives.singleOrZeroValue(JSPECIFY_STATE)?.let { 
+                    put(JSPECIFY_OLD_ANNOTATIONS_PACKAGE, it)
+                    put(JSPECIFY_ANNOTATIONS_PACKAGE, it)
+                }
                 for ((fqname, reportLevel) in directives[ForeignAnnotationsDirectives.NULLABILITY_ANNOTATIONS]) {
                     put(fqname, reportLevel)
                 }