Merge pull request #4675 from metalbear-co/aviram/bump-kube-4-2