Merge remote-tracking branch 'upstream/master'

modules/distribution/src/assembly/bin.xml

@@ -572,16 +572,6 @@
             <fileMode>644</fileMode>
         </file>
 
-	<!--API publisher config file-->
-        <file>
-            <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/user-api-publisher-config.xml
-            </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
-
         <!--License Config file-->
 	    <file>
             <source>

modules/distribution/src/repository/jaggeryapps/iotserver/api/user-api.jag

@@ -26,6 +26,7 @@ var constants = require("/modules/constants.js");
 var dcProps = require('/config/dc-props.js').config();
 var userModule = require("/modules/user.js").userModule;
 var deviceModule = require("/modules/device.js").deviceModule;
+var utility = require("/modules/utility.js").utility;
 var deviceManagementService = utility.getDeviceManagementService();
 
 var result;

modules/distribution/src/repository/jaggeryapps/iotserver/modules/utility.js

@@ -32,7 +32,7 @@ utility = function () {
     };
 
     publicMethods.getUserManagementService = function () {
-        return getOsgiService('org.wso2.carbon.device.mgt.user.core.UserManager');
+        return getOsgiService('org.wso2.carbon.user.api.UserRealmService');
     };
 
     publicMethods.getPolicyManagementService = function () {