Merge pull request #469 from menakaj/release-2.0.x

Android sense stabilization

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/app-conf.json

@@ -3,6 +3,7 @@
     "cachingEnabled": false,
     "debuggingEnabled": false,
     "permissionRoot": "/",
+    "portalURL": "https://${server.ip}:9445",
     "loginPage": "cdmf.page.sign-in",
     "adminServicesUrl": "https://${server.ip}:${server.https_port}/admin/services/",
     "authModule": {

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json

@@ -7,6 +7,7 @@
     "httpsWebURL" : "%https.ip%",
     "wssURL" : "https://localhost:9445",
     "wsURL" : "%http.ip%",
+    "portalURL": "https://${server.ip}:9445",
     "dashboardServerURL" : "%https.ip%",
     "androidEnrollmentDir": "/android-web-agent/enrollment",
     "windowsEnrollmentDir": "/windows-web-agent/enrollment",