Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server

modules/distribution/src/assembly/bin.xml

@@ -400,9 +400,22 @@
             </outputDirectory>
             <excludes>
                 <exclude>jaggery.conf</exclude>
+                <exclude>app/conf/app-conf.json</exclude>
             </excludes>
         </fileSet>
 
+        <fileSet>
+            <directory>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/devicemgt-cdmf/
+            </directory>
+            <outputDirectory>
+                ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/devicemgt
+            </outputDirectory>
+            <excludes>
+                <exclude>app/conf/app-conf.json</exclude>
+            </excludes>
+        </fileSet>
+        
         <fileSet>
             <directory>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/devicemgt/