Release 3.6.1 merge to master

[xxo1shine]

What does this PR do?
Release 3.6.1 merge to master

Why are these changes required?

This PR has been tested by:

• Unit Tests
• Manual Testing

Follow up

Extra details

[codecov-io]

Codecov Report

Merging #2338 into master will decrease coverage by 0.13%.
The diff coverage is 29.83%.

@@             Coverage Diff              @@
##             master    #2338      +/-   ##
============================================
- Coverage     42.49%   42.35%   -0.14%     
  Complexity     4345     4345              
============================================
  Files           537      538       +1     
  Lines         32525    32609      +84     
  Branches       3576     3596      +20     
============================================
- Hits          13820    13811       -9     
- Misses        17384    17468      +84     
- Partials       1321     1330       +9

Impacted Files	Coverage Δ	Complexity Δ
...java/org/tron/core/capsule/TransactionCapsule.java	15.8% <ø> (ø)	21 <0> (+1)	⬆️
...ava/org/tron/common/overlay/server/P2pHandler.java	31.91% <ø> (-0.74%)	9 <0> (ø)
src/main/java/org/tron/program/FullNode.java	0% <ø> (ø)	0 <0> (ø)	⬇️
src/main/java/org/tron/program/Version.java	50% <ø> (ø)	1 <0> (ø)	⬇️
.../accountstate/storetrie/AccountStateStoreTrie.java	31.25% <ø> (ø)	3 <0> (?)
.../tron/core/db/accountstate/AccountStateEntity.java	0% <ø> (ø)	0 <0> (?)
...ava/org/tron/core/db/accountstate/TrieService.java	20% <ø> (ø)	4 <0> (?)
.../common/overlay/server/TronChannelInitializer.java	76.19% <ø> (ø)	4 <0> (ø)	⬇️
...n/java/org/tron/core/services/NodeInfoService.java	63.23% <0%> (ø)	10 <0> (ø)	⬇️
...c/main/java/org/tron/core/net/TronNetDelegate.java	10% <0%> (+0.14%)	4 <0> (ø)	⬇️
... and 38 more

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e7b88f4...9f9f0b6. Read the comment docs.