Merge branch 'master' into 'master'

Fix ent.app install issue when installing via roles

See merge request entgra/carbon-device-mgt-plugins!71

components/extensions/appm-connector/org.wso2.carbon.appmgt.mdm.osgiconnector/src/main/java/org/wso2/carbon/appmgt/mdm/osgiconnector/ApplicationOperationsImpl.java

@@ -109,11 +109,16 @@ public class ApplicationOperationsImpl implements ApplicationOperations {
                             .getDeviceManagementService(applicationOperationAction.getTenantId()).
                                     getAllDevicesOfRole(userRole);
                     for (org.wso2.carbon.device.mgt.common.Device device : deviceList) {
-                        if (MDMAppConstants.ACTIVE.equalsIgnoreCase(device.getEnrolmentInfo().getStatus().toString())) {
+                        if (MDMAppConstants.WEBAPP.equals(applicationOperationAction.getApp().getPlatform())
+                                || applicationOperationAction.getApp().getPlatform()
+                                .equalsIgnoreCase(device.getType())) {
+                            if (MDMAppConstants.ACTIVE
+                                    .equalsIgnoreCase(device.getEnrolmentInfo().getStatus().toString())) {
                                 deviceIdentifiers.add(getDeviceIdentifierByDevice(device));
                             }
                         }
                     }
+                }
             } catch (DeviceManagementException devMgtEx) {
                 String errorMsg = "Error occurred fetch device for user role " + userRole + " at app installation";
                 logError(errorMsg, devMgtEx);