Fix Device dis-enrollment issue in APPM

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceManagementService.java

@@ -919,10 +919,11 @@ public interface DeviceManagementService {
     //device remove request would looks like follows
     //DELETE devices/type/virtual_firealarm/id/us06ww93auzp
     @DELETE
+    @Consumes(MediaType.WILDCARD)
     @Path("/type/{device-type}/id/{device-id}")
     @ApiOperation(
             produces = MediaType.APPLICATION_JSON,
-            consumes = MediaType.APPLICATION_JSON,
+            consumes = MediaType.WILDCARD,
             httpMethod = "DELETE",
             value = "Remove the Device Specified by the Device ID",
             notes = "Returns the status of the deleted device operation and the details of the deleted device.",

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java

@@ -333,6 +333,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
     }
 
     @DELETE
+    @Consumes(MediaType.WILDCARD)
     @Override
     @Path("/type/{device-type}/id/{device-id}")
     public Response deleteDevice(@PathParam("device-type") String deviceType,

features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/conf/application-mgt.xml

@@ -256,6 +256,7 @@
             <Scope>perm:geo-service:analytics-view</Scope>
             <Scope>perm:geo-service:alerts-manage</Scope>
             <Scope>appm:rea</Scope>
+	    <Scope>perm:devices:permanent-delete</Scope>
         </Scopes>
         <SSOConfiguration>
             <Issuer>app-mgt</Issuer>