Merge branch 'master' of github.com:wso2/carbon-device-mgt

features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/p2.inf

@@ -1,2 +1,2 @@
 instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/conf/webapp-authenticator-config.xml,target:${installFolder}/../../conf/etc/webapp-authenticator-config.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.webapp.authenticator.framework.server_${feature.version}/conf/webapp-authenticator-config.xml,target:${installFolder}/../../conf/etc/webapp-authenticator-config.xml,overwrite:true);\

pom.xml

@@ -1151,7 +1151,7 @@
         <!-- Carbon Device Management -->
         <carbon.device.mgt.version>0.9.2-SNAPSHOT</carbon.device.mgt.version>
 
-	<!-- Carbon Commons -->
+	    <!-- Carbon Commons -->
         <carbon.commons.version>4.4.0</carbon.commons.version>
 
         <!-- Carbon API Management -->