Merge branch 'master' into release-2.2.2

components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/syncml/impl/SyncmlServiceImpl.java

@@ -320,10 +320,10 @@ public class SyncmlServiceImpl implements SyncmlService {
                     macAddressProperty.setValue(macAddress);
                     existingProperties.add(macAddressProperty);
 
-                    Device.Property resolutionProperty = new Device.Property();
-                    resolutionProperty.setName(PluginConstants.SyncML.DEVICE_INFO);
-                    resolutionProperty.setValue("null");
-                    existingProperties.add(resolutionProperty);
+//                    Device.Property resolutionProperty = new Device.Property();
+//                    resolutionProperty.setName(PluginConstants.SyncML.DEVICE_INFO);
+//                    resolutionProperty.setValue("null");
+//                    existingProperties.add(resolutionProperty);
 
                     Device.Property deviceNameProperty = new Device.Property();
                     deviceNameProperty.setName(PluginConstants.SyncML.DEVICE_NAME);