Merge remote-tracking branch 'origin/master' into release-1.19

Kubernetes-commit: eedb7d6eb9948a015e45ff6bbb7a0e36144c181f

Godeps/Godeps.json

@@ -448,19 +448,19 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "fbbb12e99c8e"
+			"Rev": "964aaeff6c60"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "d2b2215ad471"
+			"Rev": "658236199ef9"
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "16ae2a83e32a"
+			"Rev": "f28aff35751d"
 		},
 		{
 			"ImportPath": "k8s.io/code-generator",
-			"Rev": "649de32797ee"
+			"Rev": "1c3794b15e35"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",
@@ -472,7 +472,7 @@
 		},
 		{
 			"ImportPath": "k8s.io/kube-openapi",
-			"Rev": "656914f816f9"
+			"Rev": "6aeccd4b50c6"
 		},
 		{
 			"ImportPath": "k8s.io/utils",
@@ -483,8 +483,8 @@
 			"Rev": "v0.2.0"
 		},
 		{
-			"ImportPath": "sigs.k8s.io/structured-merge-diff/v3",
-			"Rev": "43c19bbb7fba"
+			"ImportPath": "sigs.k8s.io/structured-merge-diff/v4",
+			"Rev": "v4.0.1"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/yaml",