[code sync] Merge code from sonic-net/sonic-buildimage:202305 to 202305#439

Merged

mssonicbld merged 2 commits intoAzure:202305from

mssonicbld:sonicbld/202305-merge

Aug 24, 2024

Commits on Aug 23, 2024

Update cisco-8000.ini (#19961)
jamesan47
authored

Commits on Aug 24, 2024

Merge branch '202305' of https://github.com/sonic-net/sonic-buildimage into 202305
mssonicbld
committed