Release 0.5.x: Cherry-pick #1305#1351

k8s-ci-robot merged 2 commits intokubernetes-sigs:release-0.5kubernetes-sigs/gateway-api:release-0.5from

sunjayBhatia:cherry-pick-0.5-1305sunjayBhatia/gateway-api:cherry-pick-0.5-1305Copy head branch name to clipboard