Converted JetScope to Kotlin

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/PropagationHeuristics.java

@@ -66,7 +66,7 @@ class PropagationHeuristics {
                                 arrayTypeFromSuper.getConstructor(),
                                 arrayTypeFromSuper.isNullable(),
                                 Arrays.asList(new TypeProjectionImpl(Variance.OUT_VARIANCE, elementTypeInSuper)),
-                                JetScope.EMPTY);
+                                JetScope.Empty.INSTANCE$);
 
                         data.reportError("Return type is not a subtype of overridden method. " +
                                          "To fix it, add annotation with Kotlin signature to super method with type "

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalPackageFragmentProvider.kt

@@ -96,12 +96,12 @@ public class IncrementalPackageFragmentProvider(
 
         val _memberScope: NotNullLazyValue<JetScope> = storageManager.createLazyValue {
             if (fqName !in fqNamesToLoad) {
-                JetScope.EMPTY
+                JetScope.Empty
             }
             else {
                 val packageDataBytes = incrementalCache.getPackageData(fqName)
                 if (packageDataBytes == null) {
-                    JetScope.EMPTY
+                    JetScope.Empty
                 }
                 else {
                     IncrementalPackageScope(JavaProtoBufUtil.readPackageDataFrom(packageDataBytes))