DOCKER_VERSION and docker-version havn't been implemented.

So far, it looks like the declarations are not used, and so its safer not to
confuse people into thinking they do something.

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
TestRunRedirectStdout kept failing with timed out.

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Merge pull request #8673 from SvenDowideit/whats-docker-version

DOCKER_VERSION and docker-version havn't been implemented.
Merge pull request #8718 from jfrazelle/run-redirect-test-fix

TestRunRedirectStdout kept failing with timed out.
Prioritize name lookup before ID lookup to reduce confusion
Addresses #8069

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
Merge branch '8069-prioritize-name-lookup' of github.com:estesp/docker into 8069-prioritize-name-lookup

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>