[stats-collector] Revert "Do not bundle stats-collector plugin (for release branch only)"

This reverts commit 6129b91a

build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy

@@ -92,6 +92,7 @@ abstract class BaseIdeaProperties extends ProductProperties {
     "intellij.java.langInjection.jps",
     "intellij.java.debugger.streams",
     "intellij.android.smali",
+    "intellij.statsCollector",
     "intellij.vcs.changeReminder"
   ]
   protected static final Map<String, String> CE_CLASS_VERSIONS = [
@@ -165,8 +166,6 @@ abstract class BaseIdeaProperties extends ProductProperties {
       }
     } as Consumer<PlatformLayout>
 
-    productLayout.setPluginPublishingSpec("intellij.statsCollector", new PluginPublishingSpec(includeIntoDirectoryForAutomaticUploading: false))
-
     additionalModulesToCompile = ["intellij.tools.jps.build.standalone"]
     modulesToCompileTests = ["intellij.platform.jps.build"]
   }

platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy

@@ -244,6 +244,12 @@ class CommunityRepositoryModules {
     plugin("intellij.android.smali") {
       withModule("intellij.android.smali")
     },
+    plugin("intellij.statsCollector") {
+      withModule("intellij.statsCollector.features", "features.jar")
+      withModule("intellij.statsCollector.logEvents")
+      withModule("intellij.statsCollector.completionRanker")
+      withResource("features/resources", "lib")
+    },
     plugin("intellij.griffon") {
       withModule("intellij.griffon.jps", "griffon-jps-plugin.jar")
       withModule("intellij.griffon.rt", "griffon-rt.jar")