Fix breakage of distribution integ tests

Author: rjernst

distribution/build.gradle

@@ -95,11 +95,11 @@ subprojects {
   apply plugin: 'elasticsearch.rest-test'
   project.integTest {
     dependsOn project.assemble
+    includePackaged project.name == 'integ-test-zip'
     cluster {
       distribution = project.name
     }
     if (project.name != 'integ-test-zip') {
-      includePackaged true
       // see note above with module mustRunAfter about why integTest#stop is used here
       mustRunAfter ':distribution:integ-test-zip:integTest#stop'
     }

distribution/deb/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_modules.yaml

@@ -10,4 +10,4 @@
     - do:
         nodes.info: {}
 
-    - length:  { nodes.$master.plugins: ${expected.modules.count}  }
+    - length:  { nodes.$master.modules: ${expected.modules.count}  }

distribution/rpm/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_modules.yaml

@@ -10,4 +10,4 @@
     - do:
         nodes.info: {}
 
-    - length:  { nodes.$master.plugins: ${expected.modules.count}  }
+    - length:  { nodes.$master.modules: ${expected.modules.count}  }

distribution/tar/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_modules.yaml

@@ -10,4 +10,4 @@
     - do:
         nodes.info: {}
 
-    - length:  { nodes.$master.plugins: ${expected.modules.count}  }
+    - length:  { nodes.$master.modules: ${expected.modules.count}  }

distribution/zip/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_modules.yaml

@@ -10,4 +10,4 @@
     - do:
         nodes.info: {}
 
-    - length:  { nodes.$master.plugins: ${expected.modules.count}  }
+    - length:  { nodes.$master.modules: ${expected.modules.count}  }