Merge "use object directly instead of the foreigh key to update master db object."

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

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