Merge branch 'master' into 'master'

Prevent NPE when checking for monitoring operations

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

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java

@@ -875,7 +875,7 @@ public class OperationManagerImpl implements OperationManager {
                 List<MonitoringOperation> monitoringOperations = operationMonitoringTaskConfig.getMonitoringOperation();
                 MonitoringOperation currentMonitoringOperation = null;
                 for (MonitoringOperation monitoringOperation : monitoringOperations) {
-                    if (operation.getCode().equals(monitoringOperation.getTaskName())) {
+                    if (monitoringOperation.getTaskName().equals(operation.getCode())) {
                         currentMonitoringOperation = monitoringOperation;
                         break;
                     }