Update
Merge remote-tracking branch 'cisco/csr1kv_for_routing' into csr1kv_for_routing

Conflicts:
	quantum/plugins/cisco/l3/common/service_vm_lib.py