fix ComponentVersionProcessingTest

platform/platform-impl/src/com/intellij/openapi/components/impl/stores/XmlElementStorage.java

@@ -156,7 +156,7 @@ public abstract class XmlElementStorage implements StateStorage, Disposable {
       }
 
       //noinspection deprecation
-      if (wasLoaded && !(myStreamProvider instanceof OldStreamProviderAdapter || myStreamProvider instanceof CurrentUserHolder)) {
+      if (wasLoaded && !myStreamProvider.isVersioningRequired() && !(myStreamProvider instanceof OldStreamProviderAdapter || myStreamProvider instanceof CurrentUserHolder)) {
         // we don't use local data if stream provider has one (to preserve backward compatibility, we don't use this logic for old stream providers)
         return result;
       }
@@ -576,7 +576,7 @@ public abstract class XmlElementStorage implements StateStorage, Disposable {
     myLoadedData = storageData;
   }
 
-  private void filterOutOfDate(Element element) {
+  private void filterOutOfDate(@NotNull Element element) {
     if (myRemoteVersionProvider == null) {
       return;
     }

platform/projectModel-impl/src/com/intellij/openapi/components/impl/stores/StorageData.java

@@ -85,7 +85,7 @@ public class StorageData {
         return merger.merge(serverElement, localElement);
       }
     }
-    return localElement;
+    return serverElement;
   }
 
   @Nullable