docker-py and docker python madules can't co exist

[Spyros Trigazis]

The two docker python SDKs can't co exist, we need to move from docker-py to docker.

upstream report https://github.com/docker/compose/issues/4344

They didn't fix, they just detect the conflict.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/472721

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/472721
Committed: https://git.openstack.org/cgit/openstack/magnum/commit/?id=1e0785c32089229a65f0a3d469f899440d7af2a9
Submitter: Jenkins
Branch: master

commit 1e0785c32089229a65f0a3d469f899440d7af2a9
Author: Spyros Trigazis (strigazi) <email address hidden>
Date: Fri Jun 9 14:17:18 2017 +0000

    Move to docker python SDK 2.x.x

    Since we use docker >= 12.1 we can move to docker python SDK 2.x.x.
    Docker 2.x.x is backwards compatible with older docker versions
    using the APIClient instead of the DockerClient [1].

    [1] https://docker-py.readthedocs.io/en/stable/api.html

    Change-Id: I9e50a877de6e0a8c3ba56c2d7ebbbe336972a146
    Close-Bug: #1696862

[OpenStack Infra (hudson-openstack)]

Change abandoned by Spyros Trigazis (strigazi) (<email address hidden>) on branch: master
Review: https://review.openstack.org/472697
Reason: Merged https://review.openstack.org/#/c/472721/

[OpenStack Infra (hudson-openstack)]

Change abandoned by Spyros Trigazis (strigazi) (<email address hidden>) on branch: master
Review: https://review.openstack.org/472701
Reason: Merged https://review.openstack.org/#/c/472721/

[OpenStack Infra (hudson-openstack)]

Change abandoned by Spyros Trigazis (strigazi) (<email address hidden>) on branch: master
Review: https://review.openstack.org/472708
Reason: Merged https://review.openstack.org/#/c/472721/