[vnetorch]: Use metadata matching for tunnel (sonic-net#841)
[aclorch]: Add ICMP type/code match for v4/v6 (sonic-net#868)
[restore_neighbors] fix failure with scapy 2.4.2 (sonic-net#862)
[intfsorch] Fix bug for VRF existence check (sonic-net#882)
Return 0 for CRM counter instead of None if no match (sonic-net#879)
Undo skipping Vnet tests, Vrf check before enslaving (sonic-net#857)
[Makefile]: Remove header files from source files (sonic-net#883)

Signed-off-by: Shu0T1an ChenG <shuche@microsoft.com>

[vnetorch]: Use metadata matching for tunnel (#841)
[aclorch]: Add ICMP type/code match for v4/v6 (#868)
[restore_neighbors] fix failure with scapy 2.4.2 (#862)
[intfsorch] Fix bug for VRF existence check (#882)
Return 0 for CRM counter instead of None if no match (#879)
Undo skipping Vnet tests, Vrf check before enslaving (#857)
[Makefile]: Remove header files from source files (#883)

Signed-off-by: Shu0T1an ChenG <shuche@microsoft.com>

[vnetorch]: Use metadata matching for tunnel (sonic-net#841)
[aclorch]: Add ICMP type/code match for v4/v6 (sonic-net#868)
[restore_neighbors] fix failure with scapy 2.4.2 (sonic-net#862)
[intfsorch] Fix bug for VRF existence check (sonic-net#882)
Return 0 for CRM counter instead of None if no match (sonic-net#879)
Undo skipping Vnet tests, Vrf check before enslaving (sonic-net#857)
[Makefile]: Remove header files from source files (sonic-net#883)

Signed-off-by: Shu0T1an ChenG <shuche@microsoft.com>

Signed-off-by: Stepan Blyschak <stepanb@mellanox.com>

 [watermarkstat] Fix issue of fields overwritten before display (#862)

 [watermarkstat] Fix issue of fields overwritten before display (sonic-net#862)

* src/sonic-utilities 798ce2f...7ce5b62 (19):
  > [utility] Filter FDB entries (#890)
  > [fast reboot] set a fast-reboot DB flag (#887)
  > [show] Add 'ip/ipv6 bgp network' commands (#888)
  > [Vxlan] : adding show vnet/vxlan cmds (#880)
  > [show][bgp] Use only 'show ip bgp' as the base and use bgp_frr_v4 file for FRR routing stack (#884)
  > Revert "[config] Implement a process level lock (#857)" (#882)
  > [generate_dump] Dump systemd specific information (#602)
  > [config] Implement a process level lock (#857)
  > [fwutil]: Update Command-Reference.md. (#876)
  > Add platform options to 'show techsupport' command (#865)
  > [doc]: add ltgm and jenkins badge (#875)
  > Fix even more Python warnings (#873)
  > [showtech]: dump docker stats (#864)
  > Fix more Python warnings (#869)
  > Fix Python warnings (#867)
  > Fixes bug for PFCWD feature parameters (#838)
  > Explicitly specify command names with underscores (continued) (#852)
  > [watermarkstat] Fix issue of fields overwritten before display (#862)
  > [pfc] Add command line to enable/disable/show PFC (#796)

…-net#862)

Fix the bug where the unicast/multicast queue watermark display was incorrect

- How I did it
Calculate the header list dynamically for PG and queue display
Display the correct queue numbers in the output instead of always starting the index from 0
Calculate the display position relative to the starting index

Signed-off-by: Neetha John <nejo@microsoft.com>

… automatically (sonic-net#862)

#### Why I did it
src/sonic-platform-common
```
* 7dd527a - (HEAD -> 202412, origin/202412) [code sync] Merge code from sonic-net/sonic-platform-common:202411 to 202412 (#64) (21 hours ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog