rebase fixes from v0.60.0

[tomqin93]

What this PR does / why we need it:
This PR rebases fixes from v0.60.0 back to main
Will this PR make the community happier?
Yes
Which issue this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged): fixes #

How is this PR tested

• unit test
• e2e test
• other (please specify)

Special notes for your reviewer:

Release note:

-  rebases fixes from v0.60.0 back to main

[codecov]

Codecov Report

Attention: Patch coverage is 12.50000% with 7 lines in your changes missing coverage. Please review.

Project coverage is 32.94%. Comparing base (cfc8fd1) to head (083e25d).
Report is 3 commits behind head on main.

Files with missing lines	Patch %	Lines
pkg/gateway/lwm2m/client/object.go	12.50%	7 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #1096      +/-   ##
==========================================
- Coverage   32.96%   32.94%   -0.03%     
==========================================
  Files          55       55              
  Lines        4875     4878       +3     
==========================================
  Hits         1607     1607              
- Misses       3128     3131       +3     
  Partials      140      140              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.