Merge "Supply missing cisco_cfg_agent.ini file"

diff --cc neutron/plugins/cisco/cfg_agent/cfg_agent.py
Simple merge

diff --cc neutron/plugins/cisco/cfg_agent/device_drivers/csr1kv/csr1kv_routing_driver.py
Simple merge

diff --cc neutron/plugins/cisco/cfg_agent/device_status.py
Simple merge

diff --cc neutron/tests/unit/cisco/cfg_agent/test_cfg_agent.py
Simple merge

diff --cc setup.cfg
Simple merge