Merge branch 'master' of https://github.com/wso2/product-iots into remote-control

modules/distribution/src/assembly/bin.xml

@@ -1992,16 +1992,19 @@
         <file>
             <source>src/core/resources/security/wso2carbon.jks</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/security</outputDirectory>
+            <filtered>false</filtered>
             <fileMode>644</fileMode>
         </file>
         <file>
             <source>src/core/resources/security/wso2carbon.jks</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/repository/resources/security</outputDirectory>
+            <filtered>false</filtered>
             <fileMode>644</fileMode>
         </file>
         <file>
             <source>src/core/resources/security/wso2carbon.jks</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/wso2/broker/repository/resources/security</outputDirectory>
+            <filtered>false</filtered>
             <fileMode>644</fileMode>
         </file>
 		<!--End-->

pom.xml

@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.wso2</groupId>
         <artifactId>wso2</artifactId>
-        <version>1</version>
+        <version>2</version>
     </parent>
 
     <modules>