From aeb8cb7a350d630009c1e23d3f816e05ecf729f2 Mon Sep 17 00:00:00 2001
From: charitha <charithag@wso2.com>
Date: Thu, 30 Aug 2018 14:42:08 +0530
Subject: [PATCH 1/2] Fixed configurations

---
 modules/distribution/src/core/conf/api-manager.xml | 4 ++--
 pom.xml                                            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/distribution/src/core/conf/api-manager.xml b/modules/distribution/src/core/conf/api-manager.xml
index fc1b1639..ff1e2020 100755
--- a/modules/distribution/src/core/conf/api-manager.xml
+++ b/modules/distribution/src/core/conf/api-manager.xml
@@ -86,8 +86,8 @@
             <Environment type="hybrid" api-console="true">
                 <Name>Production and Sandbox</Name>
                 <Description>This is a hybrid gateway that handles both production and sandbox token traffic.</Description>
-                <!-- Server URL of the API gateway -->
-                <ServerURL>https://${iot.gateway.host}:${iot.gateway.carbon.https.port}${carbon.context}services/</ServerURL>
+                <!-- Server URL of the API gateway manager/IoT Manager which has admin services hosted -->
+                <ServerURL>https://${iot.manager.host}:${iot.manager.https.port}${carbon.context}services/</ServerURL>
                 <!-- Admin username for the API gateway. -->
                 <Username>${admin.username}</Username>
                 <!-- Admin password for the API gateway.-->
diff --git a/pom.xml b/pom.xml
index 7e7b56fb..becd9d2a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1528,7 +1528,7 @@
         <carbon.governance.version>4.7.23</carbon.governance.version>
 
         <!-- Carbon Device Management-->
-        <carbon.device.mgt.version>3.1.34</carbon.device.mgt.version>
+        <carbon.device.mgt.version>3.1.36</carbon.device.mgt.version>
         <carbon.device.mgt.version.range>[3.1.0, 4.0.0)</carbon.device.mgt.version.range>
 
         <!-- IOT Device Management -->

From 5affc81cd6f13eccab372d14ba9362eecf6d2c3f Mon Sep 17 00:00:00 2001
From: charitha <charithag@wso2.com>
Date: Fri, 31 Aug 2018 11:08:33 +0530
Subject: [PATCH 2/2] Bump device mgt version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index becd9d2a..fd22ede4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1528,7 +1528,7 @@
         <carbon.governance.version>4.7.23</carbon.governance.version>
 
         <!-- Carbon Device Management-->
-        <carbon.device.mgt.version>3.1.36</carbon.device.mgt.version>
+        <carbon.device.mgt.version>3.1.37</carbon.device.mgt.version>
         <carbon.device.mgt.version.range>[3.1.0, 4.0.0)</carbon.device.mgt.version.range>
 
         <!-- IOT Device Management -->