This reverts commit 4a762a6a8a9bc6c4364e8a4b3588326e4fc40982.
A partial revert of 13cfceaea43f1ddc1dc4431da843e9d92e73e426 is also
performed to swap out zookeeper-statsd without affecting other images.
We perform this revert because Docker cannot do speculative gating of
images hosted anywhere but on docker.io. Speculative testing of
container images is an important feature that we wish to keep so revert
until we can stop relying on Docker.
Change-Id: I7ceafdb7cf1dfd4812ea8f12f273f01045ca89a2
d24f648db8