Updated openstack/openstack
Project: openstack/neutron  e9f161ce94b3779e20e2e045130668b2090f0c15
null
Fix ml2 & nec plugins for allowedaddresspairs tests

Enabling the allowedaddresspairs tests uncovered that update_port()
was not returning the expected updated port info (still contained
original info).

Change-Id: I88f252e1348d272edd114fbee69e2309d3740213
Closes-bug: #1255150
Updated openstack/openstack
Project: openstack/cinder  b30a54c7f0a1658be6eab2a38e13f283d0b8bb0a
null
Add missing config values for vmwware_vmdk test

Import CONF.glance_api_version from cinder.common.config

Closes-Bug: 1290883
Change-Id: I9f64c2f60efe517ad8e4ee2a98ed8da4be257b47