Merge branch 'master' into log4j2

* master:
  Correct path.conf for integ-test-zip distribution

distribution/build.gradle

@@ -490,6 +490,7 @@ Map<String, String> expansionsForDistribution(distributionType) {
     'path.conf': [
       'tar': '$ES_HOME/config',
       'zip': '$ES_HOME/config',
+      'integ-test-zip': '$ES_HOME/config',
       'def': '/etc/elasticsearch',
     ],
     'path.env': [