1b6fc7d72b
# Conflicts: # application/src/test/java/org/thingsboard/server/transport/lwm2m/security/AbstractLwM2MIntegrationTest.java # application/src/test/java/org/thingsboard/server/transport/lwm2m/security/sql/PskLwm2mIntegrationTest.java # common/util/src/main/java/org/thingsboard/common/util/JacksonUtil.java # dao/pom.xml # dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsServiceImpl.java