Merge branch 'master' into 'master'

Handle re-applying of failed policies via monitoring through a different operation code

Closes product-iots#265

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

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/impl/ComplianceDecisionPointImpl.java

@@ -153,7 +153,7 @@ public class ComplianceDecisionPointImpl implements ComplianceDecisionPoint {
                     PolicyOperation policyOperation = new PolicyOperation();
                     policyOperation.setEnabled(true);
                     policyOperation.setType(Operation.Type.POLICY);
-                    policyOperation.setCode(PolicyOperation.POLICY_OPERATION_CODE);
+                    policyOperation.setCode(PolicyManagementConstants.MONITOR_POLICY_BUNDLE);
 
                     if (complianceData.isCompletePolicy()) {
                         List<ProfileFeature> effectiveFeatures = policy.getProfile().getProfileFeaturesList();

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/util/PolicyManagementConstants.java

@@ -40,6 +40,7 @@ public final class PolicyManagementConstants {
     public static final String DEVICE_CONFIG_XML_NAME = "cdm-config.xml";
     public static final String ANY = "ANY";
     public static final String POLICY_BUNDLE = "POLICY_BUNDLE";
+    public static final String MONITOR_POLICY_BUNDLE = "MONITOR_POLICY_BUNDLE";
 
     public static final String TENANT_ID = "TENANT_ID";