Fix the scripts.
Merge pull request #1429 from brendandburns/auth

Fix the scripts. (Again)
Convert existing kubernetes system to use ContainerStatus, instead of
docker.Container directly.

Conflicts:
	pkg/kubelet/dockertools/docker.go
	pkg/registry/pod/rest.go
fix rebase issue.
Update e2e test to reflect the change.