Updated openstack/openstack
Project: openstack/neutron  b1243f6d6e10dbf88ecd53e9f1a6337e60618289
null
Rename/remove Nicira NVP references from VMware NSX unit tests

This patch sweeps for Nicira and NVP references and replace
them with VMware and NSX where possible. Some clean-up is
done along the way to improve the organization of the
unit tests module.

Partial-implements blueprint: nicira-plugin-renaming

Change-Id: I48e4779ccec64ba300b26d4967d3f9fae7cfdc14
Updated openstack/openstack
Project: openstack/nova  ad057a32fec0607721844490acafc0a2137b357d
null
VMware: fix race for datastore directory existence

Treat the exception that is raised when creating a directory
and it already exists. This may happen due to two processes trying
to create the same directory at the same time.

Change-Id: Ia0ebd674345734e7cfa31ccd400fdba93646c554
Closes-bug: #1266579