Changes for external-gateway-added
Merge remote-tracking branch 'cisco/csr1kv_for_routing' into csr1kv_for_routing