Merge pull request #100951 from saschagrunert/automated-cherry-pick-of-#99839-upstream-release-1.21

Automated cherry pick of #99839: Cleanup portforward streams after their usage

Kubernetes-commit: 9745a35d15c40607d94424776cc84a130c64d75f