WIP: Rebase 1.35#2055

jacobsee wants to merge 3 commits intoopenshift:masteropenshift/library-go:masterfrom

jacobsee:rebase-1.35jacobsee/library-go:rebase-1.35Copy head branch name to clipboard