diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 6f0c3575c..46857744f 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -388,7 +388,7 @@
 		},
 		{
 			"ImportPath": "github.com/evanphx/json-patch",
-			"Rev": "94e38aa1586e8a6c8a75770bddf5ff84c48a106b"
+			"Rev": "f195058310bd062ea7c754a834f0ff43b4b63afb"
 		},
 		{
 			"ImportPath": "github.com/ghodss/yaml",
@@ -972,619 +972,619 @@
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/fuzzer",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/roundtrip",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/meta/table",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/validation",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/validation/path",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/validation",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/fields",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/labels",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/selection",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/types",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/duration",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/json",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/naming",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/net",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/rand",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/uuid",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/waitgroup",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/version",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/watch",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
-			"Rev": "6429050ef506887d121f3e7306e894f8900d8a63"
+			"Rev": "0dbe21f815eb26c3e48873dbc609191001553a3c"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/admission",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/admission/configuration",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/admission/initializer",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/admission/metrics",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/admission/plugin/initialization",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/admission/plugin/webhook/config",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission/v1alpha1",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/admission/plugin/webhook/errors",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/admission/plugin/webhook/generic",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/admission/plugin/webhook/mutating",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/admission/plugin/webhook/namespace",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/admission/plugin/webhook/request",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/admission/plugin/webhook/rules",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/admission/plugin/webhook/util",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/admission/plugin/webhook/validating",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/apis/apiserver",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/apis/apiserver/install",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/apis/apiserver/v1alpha1",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/apis/audit",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/apis/audit/install",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/apis/audit/v1",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/apis/audit/v1alpha1",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/apis/audit/v1beta1",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/apis/audit/validation",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/audit",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/audit/policy",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/authentication/authenticator",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/authentication/authenticatorfactory",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/authentication/group",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/authentication/request/anonymous",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/authentication/request/bearertoken",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/authentication/request/headerrequest",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/authentication/request/union",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/authentication/request/websocket",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/authentication/request/x509",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/authentication/serviceaccount",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/authentication/token/tokenfile",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/authentication/user",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/authorization/authorizer",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/authorization/authorizerfactory",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/authorization/path",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/authorization/union",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/endpoints",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/endpoints/discovery",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/endpoints/filters",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/endpoints/handlers",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/endpoints/handlers/negotiation",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/endpoints/metrics",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/endpoints/openapi",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/endpoints/request",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/features",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/registry/generic",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/registry/generic/registry",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/registry/generic/testing",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/registry/rest",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/registry/rest/resttest",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/server",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/server/filters",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/server/healthz",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/server/httplog",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/server/mux",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/server/options",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/server/resourceconfig",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/server/routes",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/server/routes/data/swagger",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/server/storage",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/storage",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/storage/cacher",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/storage/errors",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/storage/etcd",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/storage/etcd/etcdtest",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/storage/etcd/metrics",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/storage/etcd/testing",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/storage/etcd/testing/testingcert",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/storage/etcd/util",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/storage/etcd3",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/storage/names",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/storage/storagebackend",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/storage/storagebackend/factory",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/storage/testing",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/storage/value",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/util/dryrun",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/util/feature",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/util/flag",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/util/flushwriter",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/util/logs",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/util/openapi",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/util/trace",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/util/webhook",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/util/wsstream",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/plugin/pkg/audit/buffered",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/plugin/pkg/audit/log",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/plugin/pkg/audit/truncate",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/plugin/pkg/audit/webhook",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/plugin/pkg/authenticator/token/webhook",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/plugin/pkg/authorizer/webhook",
-			"Rev": "f271f15f0c40b91fe68b0ae737e2006e8b58fd10"
+			"Rev": "e73ba2ce12ce3e93585fee9cb7c5233aa7c5eb56"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/discovery",
diff --git a/vendor/github.com/evanphx/json-patch/patch.go b/vendor/github.com/evanphx/json-patch/patch.go
index 1a3aa387e..d88dc89c3 100644
--- a/vendor/github.com/evanphx/json-patch/patch.go
+++ b/vendor/github.com/evanphx/json-patch/patch.go
@@ -204,7 +204,7 @@ func (n *lazyNode) equal(o *lazyNode) bool {
 }
 
 func (o operation) kind() string {
-	if obj, ok := o["op"]; ok {
+	if obj, ok := o["op"]; ok && obj != nil {
 		var op string
 
 		err := json.Unmarshal(*obj, &op)
@@ -220,7 +220,7 @@ func (o operation) kind() string {
 }
 
 func (o operation) path() string {
-	if obj, ok := o["path"]; ok {
+	if obj, ok := o["path"]; ok && obj != nil {
 		var op string
 
 		err := json.Unmarshal(*obj, &op)
@@ -236,7 +236,7 @@ func (o operation) path() string {
 }
 
 func (o operation) from() string {
-	if obj, ok := o["from"]; ok {
+	if obj, ok := o["from"]; ok && obj != nil{
 		var op string
 
 		err := json.Unmarshal(*obj, &op)
@@ -450,7 +450,7 @@ func (p Patch) add(doc *container, op operation) error {
 	con, key := findObject(doc, path)
 
 	if con == nil {
-		return fmt.Errorf("jsonpatch add operation does not apply: doc is missing path: %s", path)
+		return fmt.Errorf("jsonpatch add operation does not apply: doc is missing path: \"%s\"", path)
 	}
 
 	return con.add(key, op.value())
@@ -462,7 +462,7 @@ func (p Patch) remove(doc *container, op operation) error {
 	con, key := findObject(doc, path)
 
 	if con == nil {
-		return fmt.Errorf("jsonpatch remove operation does not apply: doc is missing path: %s", path)
+		return fmt.Errorf("jsonpatch remove operation does not apply: doc is missing path: \"%s\"", path)
 	}
 
 	return con.remove(key)
@@ -477,8 +477,8 @@ func (p Patch) replace(doc *container, op operation) error {
 		return fmt.Errorf("jsonpatch replace operation does not apply: doc is missing path: %s", path)
 	}
 
-	val, ok := con.get(key)
-	if val == nil || ok != nil {
+	_, ok := con.get(key)
+	if ok != nil {
 		return fmt.Errorf("jsonpatch replace operation does not apply: doc is missing key: %s", path)
 	}