[202405][PR: 14395][PR: 14515] Cherry pick new matching rule of conditional marks to 202405. #15047

wangxin merged 2 commits intosonic-net:202405sonic-net/sonic-mgmt:202405from

yutongzhang-microsoft:yutongzhang/cherrypick_mark_202405yutongzhang-microsoft/sonic-mgmt:yutongzhang/cherrypick_mark_202405Copy head branch name to clipboard