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

Kubernetes-commit: 6acb6808a4ce366f66037811a4009d285db951f0

Godeps/Godeps.json

@@ -128,7 +128,7 @@
 		},
 		{
 			"ImportPath": "github.com/evanphx/json-patch",
-			"Rev": "162e5629780b"
+			"Rev": "v4.9.0"
 		},
 		{
 			"ImportPath": "github.com/fsnotify/fsnotify",
@@ -238,10 +238,6 @@
 			"ImportPath": "github.com/imdario/mergo",
 			"Rev": "v0.3.5"
 		},
-		{
-			"ImportPath": "github.com/jessevdk/go-flags",
-			"Rev": "v1.4.0"
-		},
 		{
 			"ImportPath": "github.com/json-iterator/go",
 			"Rev": "v1.1.10"
@@ -448,15 +444,15 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "964aaeff6c60"
+			"Rev": "21b59c1ded36"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "658236199ef9"
+			"Rev": "b63a0c883fbf"
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "f28aff35751d"
+			"Rev": "3e55cca68bbc"
 		},
 		{
 			"ImportPath": "k8s.io/code-generator",