diff --git a/doc/common/tables/neutron-ml2_mlnx.xml b/doc/common/tables/neutron-ml2_mlnx.xml
new file mode 100644
index 0000000000..e7a36c6e74
--- /dev/null
+++ b/doc/common/tables/neutron-ml2_mlnx.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+        <!-- Warning: Do not edit this file. It is automatically
+             generated and your changes will be overwritten.
+             The tool to do so lives in the tools directory of this
+             repository -->
+        <para xmlns="http://docbook.org/ns/docbook" version="5.0">
+        <table rules="all" xml:id="config_table_neutron_ml2_mlnx">
+          <caption>Description of configuration options for ml2_mlnx</caption>
+           <col width="50%"/>
+           <col width="50%"/>
+           <thead>
+              <tr>
+                  <th>Configuration option = Default value</th>
+                  <th>Description</th>
+              </tr>
+          </thead>
+          <tbody>
+              <tr>
+                  <th colspan="2">[ESWITCH]</th>
+              </tr>
+              <tr>
+                       <td>apply_profile_patch = False</td>
+                       <td>(BoolOpt) Enable server compatibility with old nova</td>
+              </tr>
+              <tr>
+                       <td>vnic_type = mlnx_direct</td>
+                       <td>(StrOpt) Type of VM network interface: mlnx_direct or hostdev</td>
+              </tr>
+       </tbody>
+        </table>
+        </para>
diff --git a/doc/common/tables/neutron-mlnx.xml b/doc/common/tables/neutron-mlnx.xml
index 34a033015c..7d659ed987 100644
--- a/doc/common/tables/neutron-mlnx.xml
+++ b/doc/common/tables/neutron-mlnx.xml
@@ -18,10 +18,6 @@
               <tr>
                   <th colspan="2">[ESWITCH]</th>
               </tr>
-              <tr>
-                       <td>apply_profile_patch = False</td>
-                       <td>(BoolOpt) Enable server compatibility with old nova</td>
-              </tr>
               <tr>
                        <td>backoff_rate = 2</td>
                        <td>(IntOpt) backoff rate multiplier for waiting period between retries for request to daemon, i.e. value of 2 will  double the request timeout each retry</td>
@@ -38,10 +34,6 @@
                        <td>request_timeout = 3000</td>
                        <td>(IntOpt) The number of milliseconds the agent will wait for response on request to daemon.</td>
               </tr>
-              <tr>
-                       <td>vnic_type = mlnx_direct</td>
-                       <td>(StrOpt) Type of VM network interface: mlnx_direct or hostdev</td>
-              </tr>
               <tr>
                   <th colspan="2">[MLNX]</th>
               </tr>
diff --git a/doc/common/tables/neutron-nec.xml b/doc/common/tables/neutron-nec.xml
index fd71ecd9f7..8d0586896d 100644
--- a/doc/common/tables/neutron-nec.xml
+++ b/doc/common/tables/neutron-nec.xml
@@ -42,6 +42,10 @@
                        <td>key_file = None</td>
                        <td>(StrOpt) Key file</td>
               </tr>
+              <tr>
+                       <td>path_prefix = </td>
+                       <td>(StrOpt) Base URL of OFC REST API. It is prepended to each API request.</td>
+              </tr>
               <tr>
                        <td>port = 8888</td>
                        <td>(StrOpt) Port to connect to</td>
diff --git a/doc/common/tables/neutron-securitygroups.xml b/doc/common/tables/neutron-securitygroups.xml
index 756d7f9bf7..dbbde91436 100644
--- a/doc/common/tables/neutron-securitygroups.xml
+++ b/doc/common/tables/neutron-securitygroups.xml
@@ -19,8 +19,12 @@
                   <th colspan="2">[SECURITYGROUP]</th>
               </tr>
               <tr>
-                       <td>firewall_driver = neutron.agent.firewall.NoopFirewallDriver</td>
-                       <td>(StrOpt) Driver for Security Groups Firewall</td>
+                       <td>enable_security_group = True</td>
+                       <td>(BoolOpt) Controls whether the neutron security group API is enabled in the server. It should be false when using no security groups or using the nova security group API.</td>
+              </tr>
+              <tr>
+                       <td>firewall_driver = None</td>
+                       <td>(StrOpt) Driver for security groups firewall in the L2 agent</td>
               </tr>
        </tbody>
         </table>
diff --git a/doc/common/tables/neutron-vmware.xml b/doc/common/tables/neutron-vmware.xml
index cf9616afc2..a9c292e9e4 100644
--- a/doc/common/tables/neutron-vmware.xml
+++ b/doc/common/tables/neutron-vmware.xml
@@ -104,6 +104,10 @@
                        <td>nsx_gen_timeout = -1</td>
                        <td>(IntOpt) Number of seconds a generation id should be valid for (default -1 meaning do not time out)</td>
               </tr>
+              <tr>
+                       <td>replication_mode = service</td>
+                       <td>(StrOpt) The default option leverages service nodes to perform packet replication though one could set to this to 'source' to perform replication locally. This is useful if one does not want to deploy a service node(s).</td>
+              </tr>
               <tr>
                   <th colspan="2">[NSX_DHCP]</th>
               </tr>
diff --git a/doc/config-reference/networking/section_networking-plugins-ml2.xml b/doc/config-reference/networking/section_networking-plugins-ml2.xml
index 624eda472c..5b5b64cee2 100644
--- a/doc/config-reference/networking/section_networking-plugins-ml2.xml
+++ b/doc/config-reference/networking/section_networking-plugins-ml2.xml
@@ -75,6 +75,11 @@
             options</title>
         <xi:include href="../../common/tables/neutron-ml2_cisco.xml"/>
     </section>
+    <section xml:id="networking-plugin-ml2_mlnx">
+        <title>Modular Layer 2 (ml2) Mellanox Mechanism configuration
+            options</title>
+        <xi:include href="../../common/tables/neutron-ml2_mlnx.xml"/>
+    </section>
     <section xml:id="networking-plugin-ml2_odl">
         <title>Modular Layer 2 (ml2) OpenDaylight Mechanism configuration
             options</title>
diff --git a/tools/autogenerate-config-flagmappings/neutron.flagmappings b/tools/autogenerate-config-flagmappings/neutron.flagmappings
index e6364960ca..aa8843b36c 100644
--- a/tools/autogenerate-config-flagmappings/neutron.flagmappings
+++ b/tools/autogenerate-config-flagmappings/neutron.flagmappings
@@ -227,13 +227,13 @@ CISCO_N1K/tunnel_bridge cisco
 CISCO_N1K/vxlan_id_ranges cisco
 CISCO_PLUGINS/nexus_plugin cisco
 CISCO_PLUGINS/vswitch_plugin cisco
-ESWITCH/apply_profile_patch mlnx
+ESWITCH/apply_profile_patch ml2_mlnx
 ESWITCH/backoff_rate mlnx
 ESWITCH/daemon_endpoint mlnx
 ESWITCH/physical_interface_mappings mlnx
 ESWITCH/request_timeout mlnx
 ESWITCH/retries vmware
-ESWITCH/vnic_type mlnx
+ESWITCH/vnic_type ml2_mlnx
 HYPERV/network_vlan_ranges hyperv_agent
 HYPERV/tenant_network_type hyperv_agent
 LINUX_BRIDGE/physical_interface_mappings linuxbridge_agent
@@ -276,6 +276,7 @@ NSX/max_lp_per_bridged_ls vmware
 NSX/max_lp_per_overlay_ls vmware
 NSX/metadata_mode vmware
 NSX/nsx_gen_timeout vmware
+NSX/replication_mode vmware
 NSX_DHCP/default_lease_time vmware
 NSX_DHCP/domain_name vmware
 NSX_DHCP/extra_domain_name_servers vmware
@@ -294,6 +295,7 @@ OFC/driver nec
 OFC/enable_packet_filter nec
 OFC/host nec
 OFC/key_file nec
+OFC/path_prefix nec
 OFC/port nec
 OFC/use_ssl nec
 OVS/bridge_mappings openvswitch_agent
@@ -388,6 +390,7 @@ SDNVE/userid sdnve
 SDNVE_AGENT/polling_interval sdnve
 SDNVE_AGENT/root_helper sdnve
 SDNVE_AGENT/rpc sdnve
+SECURITYGROUP/enable_security_group securitygroups
 SECURITYGROUP/firewall_driver securitygroups
 SWITCH/address brocade
 SWITCH/ostype brocade