Merge branch 'develop/3.5' of github.com:thingsboard/thingsboard into develop/3.5

application/src/main/data/upgrade/3.4.4/schema_update.sql

@@ -38,4 +38,4 @@ UPDATE user_credentials
     SET additional_info = json_build_object('userPasswordHistory', (u.additional_info::json -> 'userPasswordHistory'))
     FROM tb_user u WHERE user_credentials.user_id = u.id AND u.additional_info::jsonb ? 'userPasswordHistory';
 
-UPDATE tb_user SET additional_info = tb_user.additional_info::jsonb - 'userPasswordHistory';
+UPDATE tb_user SET additional_info = tb_user.additional_info::jsonb - 'userPasswordHistory' WHERE additional_info::jsonb ? 'userPasswordHistory';