Merge "Start metadata agent without trying to connect db"

diff --cc neutron/agent/metadata_agent.py
Simple merge

diff --cc neutron/tests/unit/test_metadata_agent.py
Simple merge

diff --cc neutron/tests/unit/test_wsgi.py
Simple merge

diff --cc neutron/wsgi.py
Simple merge