Merge "Convert DHCP from polling to RPC"

diff --cc quantum/plugins/openvswitch/ovs_quantum_plugin.py
index 2c4dbb8d42c54a7fc5a1d49387ce3eadc445150e,0e47963c527c060b1099ed708ae90fb4d48abcf3..06d4592ac166486652f5ef6a3fcd0bcba8c1e9e8
--- 1/quantum/plugins/openvswitch/ovs_quantum_plugin.py
--- 2/quantum/plugins/openvswitch/ovs_quantum_plugin.py
+++ b/quantum/plugins/openvswitch/ovs_quantum_plugin.py
@@@ -27,8 -27,10 +27,9 @@@ from quantum.api import api_commo
  from quantum.api.v2 import attributes
  from quantum.common import exceptions as q_exc
  from quantum.common import topics
 -from quantum.common.utils import find_config_file
  from quantum.db import api as db
  from quantum.db import db_base_plugin_v2
+ from quantum.db import dhcp_rpc_base
  from quantum.db import models_v2
  from quantum.openstack.common import context
  from quantum.openstack.common import cfg

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