Rebase Kubernetes on 9e7ebc85aa99732a877cc326e779d4c3b31833cf

@jhadvig @vojtechvivek @mfojtik - test-cmd.sh is failing due to validation, talk to Derek
about what needs to change