diff --git a/doc/common/tables/manila-glusterfs.xml b/doc/common/tables/manila-glusterfs.xml
index 26f323c182..624feb2634 100644
--- a/doc/common/tables/manila-glusterfs.xml
+++ b/doc/common/tables/manila-glusterfs.xml
@@ -33,14 +33,6 @@
         <td><option>glusterfs_mount_point_base</option> = <replaceable>$state_path/mnt</replaceable></td>
         <td>(StrOpt) Base directory containing mount points for Gluster volumes.</td>
       </tr>
-      <tr>
-        <td><option>glusterfs_native_path_to_private_key</option> = <replaceable>None</replaceable></td>
-        <td>(StrOpt) Path of Manila host's private SSH key file.</td>
-      </tr>
-      <tr>
-        <td><option>glusterfs_native_server_password</option> = <replaceable>None</replaceable></td>
-        <td>(StrOpt) Remote GlusterFS server node's login password. This is not required if 'glusterfs_native_path_to_private_key' is configured.</td>
-      </tr>
       <tr>
         <td><option>glusterfs_nfs_server_type</option> = <replaceable>Gluster</replaceable></td>
         <td>(StrOpt) Type of NFS server that mediate access to the Gluster volumes (Gluster or Ganesha).</td>
diff --git a/doc/common/tables/manila-logging.xml b/doc/common/tables/manila-logging.xml
index 3212f57bbb..8f1168b993 100644
--- a/doc/common/tables/manila-logging.xml
+++ b/doc/common/tables/manila-logging.xml
@@ -23,7 +23,7 @@
       </tr>
       <tr>
         <td><option>default_log_levels</option> = <replaceable>amqp=WARN, amqplib=WARN, boto=WARN, qpid=WARN, sqlalchemy=WARN, suds=INFO, oslo.messaging=INFO, iso8601=WARN, requests.packages.urllib3.connectionpool=WARN, urllib3.connectionpool=WARN, websocket=WARN, requests.packages.urllib3.util.retry=WARN, urllib3.util.retry=WARN, keystonemiddleware=WARN, routes.middleware=WARN, stevedore=WARN, taskflow=WARN</replaceable></td>
-        <td>(ListOpt) List of logger=LEVEL pairs.</td>
+        <td>(ListOpt) List of logger=LEVEL pairs. This option is ignored if log_config_append is set.</td>
       </tr>
       <tr>
         <td><option>fatal_deprecations</option> = <replaceable>False</replaceable></td>
@@ -43,23 +43,23 @@
       </tr>
       <tr>
         <td><option>log_config_append</option> = <replaceable>None</replaceable></td>
-        <td>(StrOpt) The name of a logging configuration file. This file is appended to any existing logging configuration files. For details about logging configuration files, see the Python logging module documentation.</td>
+        <td>(StrOpt) The name of a logging configuration file. This file is appended to any existing logging configuration files. For details about logging configuration files, see the Python logging module documentation. Note that when logging configuration files are used then all logging configuration is set in the configuration file and other logging configuration options are ignored (for example, log_format).</td>
       </tr>
       <tr>
         <td><option>log_date_format</option> = <replaceable>%Y-%m-%d %H:%M:%S</replaceable></td>
-        <td>(StrOpt) Format string for %%(asctime)s in log records. Default: %(default)s .</td>
+        <td>(StrOpt) Format string for %%(asctime)s in log records. Default: %(default)s . This option is ignored if log_config_append is set.</td>
       </tr>
       <tr>
         <td><option>log_dir</option> = <replaceable>None</replaceable></td>
-        <td>(StrOpt) (Optional) The base directory used for relative --log-file paths.</td>
+        <td>(StrOpt) (Optional) The base directory used for relative --log-file paths. This option is ignored if log_config_append is set.</td>
       </tr>
       <tr>
         <td><option>log_file</option> = <replaceable>None</replaceable></td>
-        <td>(StrOpt) (Optional) Name of log file to output to. If no default is set, logging will go to stdout.</td>
+        <td>(StrOpt) (Optional) Name of log file to output to. If no default is set, logging will go to stdout. This option is ignored if log_config_append is set.</td>
       </tr>
       <tr>
         <td><option>log_format</option> = <replaceable>None</replaceable></td>
-        <td>(StrOpt) DEPRECATED. A logging.Formatter log message format string which may use any of the available logging.LogRecord attributes. This option is deprecated.  Please use logging_context_format_string and logging_default_format_string instead.</td>
+        <td>(StrOpt) DEPRECATED. A logging.Formatter log message format string which may use any of the available logging.LogRecord attributes. This option is deprecated.  Please use logging_context_format_string and logging_default_format_string instead. This option is ignored if log_config_append is set.</td>
       </tr>
       <tr>
         <td><option>logging_context_format_string</option> = <replaceable>%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s</replaceable></td>
@@ -83,24 +83,28 @@
       </tr>
       <tr>
         <td><option>syslog_log_facility</option> = <replaceable>LOG_USER</replaceable></td>
-        <td>(StrOpt) Syslog facility to receive log lines.</td>
+        <td>(StrOpt) Syslog facility to receive log lines. This option is ignored if log_config_append is set.</td>
       </tr>
       <tr>
         <td><option>use_stderr</option> = <replaceable>True</replaceable></td>
-        <td>(BoolOpt) Log output to standard error.</td>
+        <td>(BoolOpt) Log output to standard error. This option is ignored if log_config_append is set.</td>
       </tr>
       <tr>
         <td><option>use_syslog</option> = <replaceable>False</replaceable></td>
-        <td>(BoolOpt) Use syslog for logging. Existing syslog format is DEPRECATED and will be changed later to honor RFC5424.</td>
+        <td>(BoolOpt) Use syslog for logging. Existing syslog format is DEPRECATED and will be changed later to honor RFC5424. This option is ignored if log_config_append is set.</td>
       </tr>
       <tr>
         <td><option>use_syslog_rfc_format</option> = <replaceable>True</replaceable></td>
-        <td>(BoolOpt) (Optional) Enables or disables syslog rfc5424 format for logging. If enabled, prefixes the MSG part of the syslog message with APP-NAME (RFC5424). The format without the APP-NAME is deprecated in Kilo, and will be removed in Mitaka, along with this option.</td>
+        <td>(BoolOpt) (Optional) Enables or disables syslog rfc5424 format for logging. If enabled, prefixes the MSG part of the syslog message with APP-NAME (RFC5424). The format without the APP-NAME is deprecated in Kilo, and will be removed in Mitaka, along with this option. This option is ignored if log_config_append is set.</td>
       </tr>
       <tr>
         <td><option>verbose</option> = <replaceable>True</replaceable></td>
         <td>(BoolOpt) If set to false, will disable INFO logging level, making WARNING the default.</td>
       </tr>
+      <tr>
+        <td><option>watch_log_file</option> = <replaceable>False</replaceable></td>
+        <td>(BoolOpt) (Optional) Uses logging handler designed to watch file system. When log file is moved or removed this handler will open a new log file with specified path instantaneously. It makes sense only if log-file option is specified and Linux platform is used. This option is ignored if log_config_append is set.</td>
+      </tr>
     </tbody>
   </table>
 </para>
diff --git a/doc/common/tables/manila-redis.xml b/doc/common/tables/manila-redis.xml
index 815dfba4d4..a129ba29fb 100644
--- a/doc/common/tables/manila-redis.xml
+++ b/doc/common/tables/manila-redis.xml
@@ -15,14 +15,10 @@
     </thead>
     <tbody>
       <tr>
-        <th colspan="2">[matchmaker_redis]</th>
+        <th colspan="2">[DEFAULT]</th>
       </tr>
       <tr>
-        <td><option>host</option> = <replaceable>127.0.0.1</replaceable></td>
-        <td>(StrOpt) Host to locate redis.</td>
-      </tr>
-      <tr>
-        <td><option>password</option> = <replaceable>None</replaceable></td>
+        <td><option>password</option> = <replaceable></replaceable></td>
         <td>(StrOpt) Password for Redis server (optional).</td>
       </tr>
       <tr>
@@ -30,11 +26,19 @@
         <td>(IntOpt) Use this port to connect to redis host.</td>
       </tr>
       <tr>
-        <th colspan="2">[matchmaker_ring]</th>
+        <th colspan="2">[matchmaker_redis]</th>
       </tr>
       <tr>
-        <td><option>ringfile</option> = <replaceable>/etc/oslo/matchmaker_ring.json</replaceable></td>
-        <td>(StrOpt) Matchmaker ring file (JSON).</td>
+        <td><option>host</option> = <replaceable>127.0.0.1</replaceable></td>
+        <td>(StrOpt) Host to locate redis.</td>
+      </tr>
+      <tr>
+        <td><option>password</option> = <replaceable></replaceable></td>
+        <td>(StrOpt) Password for Redis server (optional).</td>
+      </tr>
+      <tr>
+        <td><option>port</option> = <replaceable>6379</replaceable></td>
+        <td>(IntOpt) Use this port to connect to redis host.</td>
       </tr>
     </tbody>
   </table>
diff --git a/doc/common/tables/manila-rpc.xml b/doc/common/tables/manila-rpc.xml
index b751b02454..88ed725878 100644
--- a/doc/common/tables/manila-rpc.xml
+++ b/doc/common/tables/manila-rpc.xml
@@ -17,14 +17,6 @@
       <tr>
         <th colspan="2">[DEFAULT]</th>
       </tr>
-      <tr>
-        <td><option>matchmaker_heartbeat_freq</option> = <replaceable>300</replaceable></td>
-        <td>(IntOpt) Heartbeat frequency.</td>
-      </tr>
-      <tr>
-        <td><option>matchmaker_heartbeat_ttl</option> = <replaceable>600</replaceable></td>
-        <td>(IntOpt) Heartbeat time-to-live.</td>
-      </tr>
       <tr>
         <td><option>rpc_backend</option> = <replaceable>rabbit</replaceable></td>
         <td>(StrOpt) The messaging driver to use, defaults to rabbit. Other drivers include qpid and zmq.</td>
@@ -37,6 +29,10 @@
         <td><option>rpc_conn_pool_size</option> = <replaceable>30</replaceable></td>
         <td>(IntOpt) Size of RPC connection pool.</td>
       </tr>
+      <tr>
+        <td><option>rpc_poll_timeout</option> = <replaceable>1</replaceable></td>
+        <td>(IntOpt) The default number of seconds that poll should wait. Poll raises timeout exception when timeout expired.</td>
+      </tr>
       <tr>
         <td><option>rpc_response_timeout</option> = <replaceable>60</replaceable></td>
         <td>(IntOpt) Seconds to wait for a response from a call.</td>
@@ -79,6 +75,22 @@
         <td><option>idle_timeout</option> = <replaceable>0</replaceable></td>
         <td>(IntOpt) Timeout for inactive connections (in seconds)</td>
       </tr>
+      <tr>
+        <td><option>password</option> = <replaceable></replaceable></td>
+        <td>(StrOpt) Password for message broker authentication</td>
+      </tr>
+      <tr>
+        <td><option>sasl_config_dir</option> = <replaceable></replaceable></td>
+        <td>(StrOpt) Path to directory that contains the SASL configuration</td>
+      </tr>
+      <tr>
+        <td><option>sasl_config_name</option> = <replaceable></replaceable></td>
+        <td>(StrOpt) Name of configuration file (without .conf suffix)</td>
+      </tr>
+      <tr>
+        <td><option>sasl_mechanisms</option> = <replaceable></replaceable></td>
+        <td>(StrOpt) Space separated list of acceptable SASL mechanisms</td>
+      </tr>
       <tr>
         <td><option>server_request_prefix</option> = <replaceable>exclusive</replaceable></td>
         <td>(StrOpt) address prefix used when sending to a specific server</td>
@@ -103,6 +115,10 @@
         <td><option>trace</option> = <replaceable>False</replaceable></td>
         <td>(BoolOpt) Debug: dump AMQP frames to stdout</td>
       </tr>
+      <tr>
+        <td><option>username</option> = <replaceable></replaceable></td>
+        <td>(StrOpt) User name for message broker authentication</td>
+      </tr>
     </tbody>
   </table>
 </para>
diff --git a/doc/common/tables/manila-zeromq.xml b/doc/common/tables/manila-zeromq.xml
index 5c0134df6e..08abf4e473 100644
--- a/doc/common/tables/manila-zeromq.xml
+++ b/doc/common/tables/manila-zeromq.xml
@@ -17,10 +17,18 @@
       <tr>
         <th colspan="2">[DEFAULT]</th>
       </tr>
+      <tr>
+        <td><option>rpc_zmq_all_req_rep</option> = <replaceable>True</replaceable></td>
+        <td>(BoolOpt) Use REQ/REP pattern for all methods CALL/CAST/FANOUT.</td>
+      </tr>
       <tr>
         <td><option>rpc_zmq_bind_address</option> = <replaceable>*</replaceable></td>
         <td>(StrOpt) ZeroMQ bind address. Should be a wildcard (*), an ethernet interface, or IP. The "host" option should point or resolve to this address.</td>
       </tr>
+      <tr>
+        <td><option>rpc_zmq_concurrency</option> = <replaceable>eventlet</replaceable></td>
+        <td>(StrOpt) Type of concurrency used. Either "native" or "eventlet"</td>
+      </tr>
       <tr>
         <td><option>rpc_zmq_contexts</option> = <replaceable>1</replaceable></td>
         <td>(IntOpt) Number of ZeroMQ contexts, defaults to 1.</td>
@@ -34,17 +42,17 @@
         <td>(StrOpt) Directory for holding IPC sockets.</td>
       </tr>
       <tr>
-        <td><option>rpc_zmq_matchmaker</option> = <replaceable>local</replaceable></td>
+        <td><option>rpc_zmq_matchmaker</option> = <replaceable>redis</replaceable></td>
         <td>(StrOpt) MatchMaker driver.</td>
       </tr>
-      <tr>
-        <td><option>rpc_zmq_port</option> = <replaceable>9501</replaceable></td>
-        <td>(IntOpt) ZeroMQ receiver listening port.</td>
-      </tr>
       <tr>
         <td><option>rpc_zmq_topic_backlog</option> = <replaceable>None</replaceable></td>
         <td>(IntOpt) Maximum number of ingress messages to locally buffer per topic. Default is unlimited.</td>
       </tr>
+      <tr>
+        <td><option>zmq_use_broker</option> = <replaceable>True</replaceable></td>
+        <td>(BoolOpt) Shows whether zmq-messaging uses broker or not.</td>
+      </tr>
     </tbody>
   </table>
 </para>
diff --git a/tools/autogenerate-config-flagmappings/manila.flagmappings b/tools/autogenerate-config-flagmappings/manila.flagmappings
index ab1281780c..28820e1918 100644
--- a/tools/autogenerate-config-flagmappings/manila.flagmappings
+++ b/tools/autogenerate-config-flagmappings/manila.flagmappings
@@ -55,8 +55,6 @@ glusterfs_ganesha_server_ip glusterfs
 glusterfs_ganesha_server_password glusterfs
 glusterfs_ganesha_server_username glusterfs
 glusterfs_mount_point_base glusterfs
-glusterfs_native_path_to_private_key glusterfs
-glusterfs_native_server_password glusterfs
 glusterfs_nfs_server_type glusterfs
 glusterfs_path_to_private_key glusterfs
 glusterfs_server_password glusterfs
@@ -106,8 +104,6 @@ logging_default_format_string logging
 logging_exception_prefix logging
 manila_huawei_conf_file huawei
 manila_service_keypair_name share
-matchmaker_heartbeat_freq rpc
-matchmaker_heartbeat_ttl rpc
 max_age quota
 max_gigabytes storage
 max_header_line api
@@ -164,12 +160,14 @@ osapi_share_listen api
 osapi_share_listen_port api
 osapi_share_workers api
 ovs_integration_bridge share
+password redis
 path_to_private_key share
 path_to_public_key share
 periodic_fuzzy_delay common
 periodic_hooks_interval common
 periodic_interval common
 pool_weight_multiplier scheduler
+port redis
 publish_errors logging
 quobyte_api_ca quobyte
 quobyte_api_password quobyte
@@ -193,13 +191,15 @@ rootwrap_config common
 rpc_backend rpc
 rpc_cast_timeout rpc
 rpc_conn_pool_size rpc
+rpc_poll_timeout rpc
 rpc_response_timeout rpc
+rpc_zmq_all_req_rep zeromq
 rpc_zmq_bind_address zeromq
+rpc_zmq_concurrency zeromq
 rpc_zmq_contexts zeromq
 rpc_zmq_host zeromq
 rpc_zmq_ipc_dir zeromq
 rpc_zmq_matchmaker zeromq
-rpc_zmq_port zeromq
 rpc_zmq_topic_backlog zeromq
 scheduler_default_filters scheduler
 scheduler_default_weighers scheduler
@@ -270,6 +270,7 @@ verbose logging
 volume_api_class api
 volume_name_template api
 volume_snapshot_name_template api
+watch_log_file logging
 winrm_cert_key_pem_path winrm
 winrm_cert_pem_path winrm
 winrm_conn_timeout winrm
@@ -292,6 +293,7 @@ zfssa_nas_vscan zfssa
 zfssa_pool zfssa
 zfssa_project zfssa
 zfssa_rest_timeout zfssa
+zmq_use_broker zeromq
 cors/allow_credentials cors
 cors/allow_headers cors
 cors/allow_methods cors
@@ -365,7 +367,6 @@ keystone_authtoken/token_cache_time auth_token
 matchmaker_redis/host redis
 matchmaker_redis/password redis
 matchmaker_redis/port redis
-matchmaker_ring/ringfile redis
 oslo_concurrency/disable_process_locking rpc
 oslo_concurrency/lock_path rpc
 oslo_messaging_amqp/allow_insecure_clients rpc
@@ -373,12 +374,17 @@ oslo_messaging_amqp/broadcast_prefix rpc
 oslo_messaging_amqp/container_name rpc
 oslo_messaging_amqp/group_request_prefix rpc
 oslo_messaging_amqp/idle_timeout rpc
+oslo_messaging_amqp/password rpc
+oslo_messaging_amqp/sasl_config_dir rpc
+oslo_messaging_amqp/sasl_config_name rpc
+oslo_messaging_amqp/sasl_mechanisms rpc
 oslo_messaging_amqp/server_request_prefix rpc
 oslo_messaging_amqp/ssl_ca_file rpc
 oslo_messaging_amqp/ssl_cert_file rpc
 oslo_messaging_amqp/ssl_key_file rpc
 oslo_messaging_amqp/ssl_key_password rpc
 oslo_messaging_amqp/trace rpc
+oslo_messaging_amqp/username rpc
 oslo_messaging_qpid/amqp_auto_delete qpid
 oslo_messaging_qpid/amqp_durable_queues qpid
 oslo_messaging_qpid/qpid_heartbeat qpid