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

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java

@@ -144,6 +144,10 @@ public class DeviceManagementServiceComponent {
 		}
 	}
 
+    protected void deactivate(ComponentContext componentContext) {
+        //do nothing
+    }
+
     private void registerServices(ComponentContext componentContext) {
         if (log.isDebugEnabled()) {
             log.debug("Registering OSGi service DeviceManagementServiceImpl");