Merge "Use Query instances as iterables when possible"

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

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

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

diff --cc quantum/db/loadbalancer/loadbalancer_db.py
Simple merge

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

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

diff --cc quantum/plugins/nicira/QuantumPlugin.py
Simple merge