# Conflicts: # application/src/main/java/org/thingsboard/server/controller/AdminController.java # application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java # application/src/main/java/org/thingsboard/server/service/security/model/token/JwtTokenFactory.java