Address review comment: Rename docker module to be private.
Address review comment: Link to follow-up story.
Address review comment: Simplify logic slightly.
Address review comment: Link to followup issue.
Address review comment: Don't use numeric values directly.
Fix race condition with Docker not knowing a container was added inside
DockerClient.add(), rather than trying to work around it piecemeal elsewhere.
Fix docker-py package name in specfile.
Lint fixes.
Bump docker-py version to 0.4.0.
Merge branch 'docker-client-64' of github.com:ClusterHQ/flocker into docker-client-64
Merge branch 'docker-client-64' into remove-gearclient-712

Conflicts:
	flocker/node/functional/test_docker.py
Fix imports to point at new module location.