Updated openstack/openstack
Project: openstack/python-heatclient  b4476d7590f230febeff3153d9acf32710f3a7cd
null
Deprecate mox in favor of mox3

Instead of having to use both mox and mox3, just pick
mox3.

Change-Id: I98fde1a748da97db2a8e6ac99d5354b44edb1c28
Signed-off-by: Chuck Short <chuck.short@canonical.com>
Updated openstack/openstack
Project: openstack/heat  083571254350c336a64cbd050d886492ece8c025
null
Allow docker plugin to run w/o deps

The docker plugin tests would not run without the docker lib being
installed even though the client was mocked in the tests. This
patch adds conditional import of the client and registration of
the plugin so that the contrib tests can be run in the gates
without having to hack requirements or add more third party
libs.

Change-Id: Ia114f8ebc0cf0b72af8e6e5d2c3264fb7952d7f9
Partial-Bug: #1251380