Merge branch 'master' of https://github.com/rajdeepd/kubernetes

Conflicts:
	pkg/client/kubelet_test.go
Merge branch 'master' of https://github.com/rajdeepd/kubernetes