Updated openstack/openstack
Project: openstack/nova  099a2c16f08197623b2832e09b5c4ee7734ef366
null
VMware: remove double import

"import mock" was done twice.

Change-Id: Ibc38d27d7fd8b57b193cbe37d2abd89b823ed43f