diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 8e32b3e7..ddfb838d 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -392,203 +392,203 @@
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/fields",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/labels",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/selection",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/types",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/json",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/net",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/version",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/watch",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
-			"Rev": "9864a8e9afd158940f5f5f7803e7683d0512ef09"
+			"Rev": "f534d624797b270e5e46104dc7e2c2d61edbb85d"
 		},
 		{
 			"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
diff --git a/util/flowcontrol/backoff_test.go b/util/flowcontrol/backoff_test.go
index 23a6cbfa..b14ab341 100644
--- a/util/flowcontrol/backoff_test.go
+++ b/util/flowcontrol/backoff_test.go
@@ -75,7 +75,7 @@ func TestBackoffReset(t *testing.T) {
 	}
 }
 
-func TestBackoffHightWaterMark(t *testing.T) {
+func TestBackoffHighWaterMark(t *testing.T) {
 	id := "_idHiWaterMark"
 	tc := clock.NewFakeClock(time.Now())
 	step := time.Second