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

Merged

mssonicbld merged 2 commits intoAzure:202305from

mssonicbld:sonicbld/202305-merge

Jan 18, 2024

Commits on Jan 17, 2024

[Arista] Update config.bcm of 7060_cx32s for handling 40g optics with unreliable los settings (#17768)

vdahiya12
authored and
mssonicbld
committed

Commits on Jan 18, 2024

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