Merge branch 'sync_fix' into 'master'

Fix issue in enrollment object modification

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

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/status/task/impl/DeviceStatusMonitoringTask.java

@@ -99,8 +99,7 @@ public class DeviceStatusMonitoringTask extends DynamicPartitionedScheduleTask {
                 long lastUpdatedTime = (timeMillis - monitoringData
                         .getLastUpdatedTime()) / 1000;
 
-                EnrolmentInfo enrolmentInfo = new EnrolmentInfo();
-                enrolmentInfo.setId(monitoringData.getDevice().getEnrolmentInfo().getId());
+                EnrolmentInfo enrolmentInfo = monitoringData.getDevice().getEnrolmentInfo();
                 EnrolmentInfo.Status status = null;
                 if (lastUpdatedTime >= this.deviceStatusTaskPluginConfig
                         .getIdleTimeToMarkInactive()) {