Merge branch 'master' into jenkinsfile

components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/util/MQTTAdapterListener.java

@@ -243,6 +243,8 @@ public class MQTTAdapterListener implements MqttCallback, Runnable {
             } else {
                 inputEventAdapterListener.onEvent(msgText);
             }
+        } catch (Exception ex) {
+          log.error("Error in message arrive : ", ex);
         } finally {
             PrivilegedCarbonContext.endTenantFlow();
         }

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/DeviceManagementAdminService.java

@@ -231,7 +231,7 @@ import java.util.List;
                 @Scope(
                         name = "Password Policy",
                         description = "Set password policy of an Android Device",
-                        key = "and:ops:password-policy",
+                        key = "and:ops:pwd-policy",
                         roles = {"Internal/devicemgt-admin"},
                         permissions = {"/device-mgt/devices/owning-device/operations/android/password-policy"}
                 ),
@@ -1751,7 +1751,7 @@ public interface DeviceManagementAdminService {
             tags = "Android Device Management Administrative Service",
             extensions = {
                     @Extension(properties = {
-                            @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:password-policy")
+                            @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:pwd-policy")
                     })
             }
     )

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/config.json

@@ -21,7 +21,7 @@
             "and:ops:mute",
             "and:ops:change-lock-code",
             "and:ops:blacklist-app",
-            "and:ops:password-policy",
+            "and:ops:pwd-policy",
             "and:ops:encrypt-storage",
             "and:ops:clear-password",
             "and:ops:enterprise-wipe",