Merge "PLUMgrid plugin decomposition part II"

diff --cc setup.cfg
index a649073034745d7d3380261eff65584fdc58faa8,de3d295e76d57a6f6a6bd5dce2f751e80a959853..5f3de4db123ca61bdd6a282800aadde2c4a9cfd1
--- 1/setup.cfg
--- 2/setup.cfg
+++ b/setup.cfg
@@@ -68,9 -70,9 +68,8 @@@ data_files 
          etc/neutron/plugins/ml2/ml2_conf_sriov.ini
          etc/neutron/plugins/ml2/openvswitch_agent.ini
      etc/neutron/plugins/mlnx = etc/neutron/plugins/mlnx/mlnx_conf.ini
 -    etc/neutron/plugins/nec = etc/neutron/plugins/nec/nec.ini
      etc/neutron/plugins/nuage = etc/neutron/plugins/nuage/nuage_plugin.ini
      etc/neutron/plugins/oneconvergence = etc/neutron/plugins/oneconvergence/nvsdplugin.ini
-     etc/neutron/plugins/plumgrid = etc/neutron/plugins/plumgrid/plumgrid.ini
      etc/neutron/plugins/opencontrail = etc/neutron/plugins/opencontrail/contrailplugin.ini
      etc/neutron/plugins/ovsvapp = etc/neutron/plugins/ovsvapp/ovsvapp_agent.ini
  scripts =
@@@ -108,11 -111,12 +107,10 @@@ neutron.core_plugins 
      brocade = neutron.plugins.brocade.NeutronPlugin:BrocadePluginV2
      cisco = neutron.plugins.cisco.network_plugin:PluginV2
      embrane = neutron.plugins.embrane.plugins.embrane_ml2_plugin:EmbraneMl2Plugin
 -    ibm = neutron.plugins.ibm.sdnve_neutron_plugin:SdnvePluginV2
      midonet = neutron.plugins.midonet.plugin:MidonetPluginV2
      ml2 = neutron.plugins.ml2.plugin:Ml2Plugin
 -    nec = neutron.plugins.nec.nec_plugin:NECPluginV2
      nuage = neutron.plugins.nuage.plugin:NuagePlugin
      oneconvergence = neutron.plugins.oneconvergence.plugin:OneConvergencePluginV2
-     plumgrid = neutron.plugins.plumgrid.plumgrid_plugin.plumgrid_plugin:NeutronPluginPLUMgridV2
  neutron.service_plugins =
      dummy = neutron.tests.unit.dummy_plugin:DummyServicePlugin
      router = neutron.services.l3_router.l3_router_plugin:L3RouterPlugin