Merge branch 'master' into 'master'

Add new ownership types and fix application updating issues

See merge request entgra/carbon-device-mgt!723

components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ApplicationManagerImpl.java

@@ -1969,7 +1969,8 @@ public class ApplicationManagerImpl implements ApplicationManager {
         ApplicationDTO applicationDTO = getApplication(applicationId);
         try {
             ConnectionManagerUtil.beginDBTransaction();
-            if (!StringUtils.isEmpty(applicationUpdateWrapper.getName())){
+            if (!StringUtils.isEmpty(applicationUpdateWrapper.getName()) && !applicationDTO.getName()
+                    .equals(applicationUpdateWrapper.getName())) {
                 if (applicationDAO
                         .isExistingAppName(applicationUpdateWrapper.getName().trim(), applicationDTO.getDeviceTypeId(),
                                 tenantId)) {

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/EnrolmentInfo.java

@@ -36,7 +36,7 @@ public class EnrolmentInfo implements Serializable {
     }
 
     public enum OwnerShip {
-        BYOD, COPE, WORK_PROFILE, GOOGLE_ENTERPRISE, COSU
+        BYOD, COPE, WORK_PROFILE, GOOGLE_ENTERPRISE, COSU, FULLY_MANAGED, DEDICATED_DEVICE
     }
 
     @ApiModelProperty(name = "id", value = "ID of the device in the WSO2 EMM device information database.",