Merge "Extending quota support for neutron LBaaS entities"

diff --cc etc/neutron.conf
Simple merge

diff --cc neutron/tests/unit/services/loadbalancer/test_loadbalancer_plugin.py
index 94acdc6e04d3542b33f62abdd7f362557338e93a,8f3afb38158a7a9e30652d47da539f3f42f744b1..c5de647850191738573e5be67a5b1b51da548482
--- 1/neutron/tests/unit/services/loadbalancer/test_loadbalancer_plugin.py
--- 2/neutron/tests/unit/services/loadbalancer/test_loadbalancer_plugin.py
+++ b/neutron/tests/unit/services/loadbalancer/test_loadbalancer_plugin.py
@@@ -26,8 -26,10 +26,9 @@@ from neutron.api import extension
  from neutron.api.v2 import attributes as attr
  from neutron.common import config
  from neutron.extensions import loadbalancer
 -from neutron import manager
  from neutron.openstack.common import uuidutils
  from neutron.plugins.common import constants
+ from neutron import quota
  from neutron.tests.unit import test_api_v2
  from neutron.tests.unit import test_extensions
  from neutron.tests.unit import testlib_api