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

Kubernetes-commit: bbb37e6328b99a3bd1ff3e371aff3655656952c1

Godeps/Godeps.json

@@ -128,7 +128,7 @@
 		},
 		{
 			"ImportPath": "github.com/evanphx/json-patch",
-			"Rev": "e83c0a1c26c8"
+			"Rev": "162e5629780b"
 		},
 		{
 			"ImportPath": "github.com/fsnotify/fsnotify",
@@ -238,6 +238,10 @@
 			"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"
@@ -444,15 +448,15 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "e83062b676e4"
+			"Rev": "fbbb12e99c8e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "7efdc26a675c"
+			"Rev": "d2b2215ad471"
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "470e5168e52f"
+			"Rev": "16ae2a83e32a"
 		},
 		{
 			"ImportPath": "k8s.io/code-generator",