Cherry-pick PRs in master branch to unblock PR checks.#758

xumia merged 2 commits intosonic-net:202205sonic-net/sonic-swss-common:202205from

liushilongbuaa:template-202205liushilongbuaa/sonic-swss-common:template-202205Copy head branch name to clipboard