Change to reflect veth pair name change in nova.
Merge branch 'bp/csr1kv_for_routing' of 172.16.6.9:/opt/stack/quantum into csr1kv_for_routing