Merge "rename quantum into neutron"

diff --cc etc/neutron/plugins/ml2/ml2_conf.ini
index 4ad62e3eef5f0eb3f09a8b4fb1c236f2f1509883,992744b3c478e72e875f1853603275a4ef288f23..25022a4861a9f9fd75d2094259d369b39b76aa78
--- 1/etc/neutron/plugins/ml2/ml2_conf.ini
--- 2/etc/neutron/plugins/ml2/ml2_conf.ini
+++ b/etc/neutron/plugins/ml2/ml2_conf.ini
@@@ -1,10 -1,10 +1,10 @@@
  
  [ml2]
  # (ListOpt) List of network type driver entrypoints to be loaded from
- # the quantum.ml2.type_drivers namespace.
+ # the neutron.ml2.type_drivers namespace.
  #
 -# type_drivers = local,flat,vlan
 -# Example: type_drivers = flat,vlan,gre
 +# type_drivers = local,flat,vlan,gre,vxlan
 +# Example: type_drivers = flat,vlan,gre,vxlan
  
  # (ListOpt) Ordered list of network_types to allocate as tenant
  # networks. The default value 'local' is useful for single-box testing

diff --cc etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
Simple merge

diff --cc etc/rootwrap.conf
Simple merge