Merge branch 'develop/3.3' into lwm2m_fix_bug_front

# Conflicts:
#	common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClient.java

@@ -116,6 +116,11 @@ public class LwM2mClient implements Cloneable {
         });
         });
     }
     }
 
 
+    /**
+     *
+     * @param idVer -
+     * @param modelProvider -
+     */
     public void updateResourceModel(String idVer, LwM2mModelProvider modelProvider) {
     public void updateResourceModel(String idVer, LwM2mModelProvider modelProvider) {
         Set key = getKeysEqualsIdVer(idVer);
         Set key = getKeysEqualsIdVer(idVer);
         key.forEach(k -> this.saveResourceModel(k.toString(), modelProvider));
         key.forEach(k -> this.saveResourceModel(k.toString(), modelProvider));