Sync with brancb under review

Change-Id: I386b8c9bcf473f5c6ad01cac1f81a58fa0e60b6b
Merge branch 'csr1kv_for_routing_juno_minimal' of github.com:CiscoSystems/neutron into csr1kv_for_routing_juno_minimal