Merge branch 'master' into fix/golint2

Conflicts:
	pkg/api/types.go
	pkg/health/health_check.go
	pkg/kubelet/kubelet.go
	pkg/kubelet/kubelet_server.go
	pkg/kubelet/kubelet_server_test.go
	pkg/kubelet/kubelet_test.go
Fixes new golint errors in pkg/kubelet after merge
Correct an error message
Fix a build failure of a test