Cherry Pick #4712,#4671 To Release 26#4737

k8s-ci-robot merged 2 commits into

kubernetes-client:release-26kubernetes-client/java:release-26from

laureanobrs:laureanobrs-cherry-pick-4712laureanobrs/fork-kubernetes-java-client:laureanobrs-cherry-pick-4712Copy head branch name to clipboard