[FIR] Ignore failing test, improve DiagnosticKind, fix UPPER_BOUND

compiler/testData/diagnostics/tests/thisAndSuper/Super.fir.kt

@@ -56,7 +56,7 @@ class CG : G<Int> {
 }
 
 // The case when no supertype is resolved
-class ERROR<E>() : <!OTHER_ERROR!>UR<!> {
+class ERROR<E>() : <!UNRESOLVED_REFERENCE!>UR<!> {
 
     fun test() {
         super.<!UNRESOLVED_REFERENCE!>foo<!>()

compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/unqualifiedSuperWithUnresolvedBase.fir.kt

@@ -21,7 +21,7 @@ interface Interface {
         get() = 222
 }
 
-class ClassDerivedFromUnresolved : Base(), Interface, <!OTHER_ERROR!>Unresolved<!> {
+class ClassDerivedFromUnresolved : Base(), Interface, <!UNRESOLVED_REFERENCE!>Unresolved<!> {
     override fun foo() {}
     override fun bar() {}