Upstream merged PRs

@smarterclayton those are the two PRs which have been merged in to upstream k8s and need to be placed into our vendored k8s.