Prevents a portinfo deletion in vm migration with NEC plugin.

Fixes: Bug 1160193

This patch prevents a portinfo deletion at the end of the migration sequence
by ignoring port_removed message from the source host.

Change-Id: I96932587b9d660aa01f8fcae0b0426c849d6c483
Fix kwargs for FloatingIPPortAlreadyAssociated.

Updates the NVP plugin to use the correct kwargs when raising
l3.FloatingIPPortAlreadyAssociated.

Fixes LP Bug #1159922.

Change-Id: If89feea5e40976ccb4286f96f5348c54f84950ce
Raise VipExists exception in case Vip is created or updated
for a pool that already has a Vip

fixes bug 1158049

Change-Id: I258a31f5d54c040ed478ab241b0e90f2bd0f69b3
Pass metadata port to metadata proxy

Make the l3 agent pass the port used by the metadata service to the router namespace proxy when
creating it and add also new tests for this.

Fixes LP# 1160955
Change-Id: Iec8a5238345b26e70b0aa1dc96a896e26af34722
Fix unit tests for RHEL

Fixes bug 1158609
Fixes bug 1158612

Change-Id: I5ee6214a935cfa663c96b1ba6893f265890c4202
Mark 'sql_connection' config option as secret

Fixes bug 1160680.

Change-Id: I42b16d006f162cb41090fa34677d6ad054b6a55a
Fix kwargs for NECDBException.

Updates the NEC plugin to use the correct kwargs when raising
NECDBException.

Fixes LP Bug #1159925.

Change-Id: I1e96d4ec65c1bc98d90d2eb9867fe39bbd505cdc
Fix for Cisco plugin physical device config error

This patch fixes a bug with the Cisco plugin where subsequent vlan id's
would overwrite the existing trunking config on a switch interface.

Change-Id: I5e97c00062f687838e60e5dc9470f4a62289676b
Fixes: Bug #1161946
Merge "Pass metadata port to metadata proxy" into stable/grizzly
Merge "Fix for Cisco plugin physical device config error" into stable/grizzly
Merge "Mark 'sql_connection' config option as secret" into stable/grizzly
Merge "Prevents a portinfo deletion in vm migration with NEC plugin." into stable/grizzly
Merge "Fix unit tests for RHEL" into stable/grizzly
Merge "Fix kwargs for FloatingIPPortAlreadyAssociated." into stable/grizzly
Merge "Fix kwargs for NECDBException." into stable/grizzly
Merge "Raise VipExists exception in case Vip is created or updated for a pool that already has a Vip" into stable/grizzly
Merge branch 'stable/grizzly' of https://github.com/openstack/quantum into iteco