Merge "Bug 1666: Fixing the clustering config file issue"

diff --combined opendaylight/distribution/opendaylight/pom.xml
index 3b317d95f5a954ea8ec110f2aa52d8070805d32c,e5fe8ba78d87cbd60d0f996cee9fb5ae788e95ab..7f9f56f6cdd7ec639d7d89bedd2b265aeb8e4953
--- 1/opendaylight/distribution/opendaylight/pom.xml
--- 2/opendaylight/distribution/opendaylight/pom.xml
+++ b/opendaylight/distribution/opendaylight/pom.xml
@@@ -634,6 -634,10 +634,6 @@@
        <groupId>org.opendaylight.controller.thirdparty</groupId>
        <artifactId>net.sf.jung2</artifactId>
      </dependency>
 -    <dependency>
 -      <groupId>org.opendaylight.controller.thirdparty</groupId>
 -      <artifactId>org.apache.catalina.filters.CorsFilter</artifactId>
 -    </dependency>
      <dependency>
        <groupId>org.opendaylight.controller.thirdparty</groupId>
        <artifactId>org.openflow.openflowj</artifactId>
@@@ -1375,8 -1379,8 +1375,8 @@@
                  <phase>generate-resources</phase>
                  <configuration>
                     <outputDirectory>${project.build.directory}/configuration</outputDirectory>
-                    <includeArtifactIds>sal-rest-connector-config,config-netty-config,md-sal-config,netconf-config,toaster-config,netconf-connector-config</includeArtifactIds>
-                    <includes>**\/*.xml</includes>
+                     <includeArtifactIds>sal-rest-connector-config,config-netty-config,md-sal-config,netconf-config,toaster-config,netconf-connector-config,sal-clustering-config</includeArtifactIds>
+                     <includes>**\/*.xml,**/*.conf</includes>
                     <excludeTransitive>true</excludeTransitive>
                     <ignorePermissions>false</ignorePermissions>
                  </configuration>