Merge "Remove compat cfg wrapper"

diff --cc quantum/db/agents_db.py
Simple merge

diff --cc quantum/extensions/loadbalancer.py
Simple merge

diff --cc quantum/tests/unit/nicira/test_networkgw.py
Simple merge

diff --cc quantum/tests/unit/test_agent_ext_plugin.py
Simple merge

diff --cc quantum/tests/unit/test_routerserviceinsertion.py
Simple merge

diff --cc tools/pip-requires
Simple merge