[release/v1.4] cherry-pick for #6979#6984

arkodg merged 1 commit intoenvoyproxy:release/v1.4envoyproxy/gateway:release/v1.4from

shawnh2:fix-benchmarkshawnh2/gateway:fix-benchmarkCopy head branch name to clipboard