merged updates

components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/gcm/GCMService.java

@@ -57,4 +57,8 @@ public class GCMService {
             log.error("Exception occurred while sending the GCM notification : " + result.getErrorMsg());
         }
     }
+
+    public void resetTenantConfigCache() {
+        GCMUtil.resetTenantConfigCache();
+    }
 }

components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/gcm/GCMUtil.java

@@ -177,6 +177,10 @@ public class GCMUtil {
         return null;
     }
 
+    public static void resetTenantConfigCache() {
+        tenantConfigurationCache.remove(getTenantId());
+    }
+
     private static void addTenantConfigurationToCache(TenantConfiguration tenantConfiguration) {
         tenantConfigurationCache.put(getTenantId(), tenantConfiguration);
     }

components/device-mgt/org.wso2.carbon.device.mgt.mobile.url.printer/src/main/java/org/wso2/carbon/device/mgt/mobile/url/printer/URLPrinterStartupHandler.java

@@ -58,7 +58,7 @@ public class URLPrinterStartupHandler implements ServerStartupObserver {
         if (httpsProxyPort > 0) {
             port = httpsProxyPort;
         }
-        return "https://" + hostName + ":" + port + "/mdm";
+        return "https://" + hostName + ":" + port + "/emm";
     }
 
 }