More VXLAN testing.
Merge branch 'rcurran/vxlan' of https://github.com/CiscoSystems/neutron into rcurran/vxlan
VXLAN updates