diff --git a/doc/common/tables/trove-amqp.xml b/doc/common/tables/trove-amqp.xml
index 02e015c5dc..2471213b21 100644
--- a/doc/common/tables/trove-amqp.xml
+++ b/doc/common/tables/trove-amqp.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_trove_amqp">
-    <caption>Description of configuration options for amqp</caption>
+    <caption>Description of AMQP configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/trove-api.xml b/doc/common/tables/trove-api.xml
index 5add5482d9..cb6491cc1f 100644
--- a/doc/common/tables/trove-api.xml
+++ b/doc/common/tables/trove-api.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_trove_api">
-    <caption>Description of configuration options for api</caption>
+    <caption>Description of API configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/trove-auth_token.xml b/doc/common/tables/trove-auth_token.xml
index 9412dd9be8..32180eba84 100644
--- a/doc/common/tables/trove-auth_token.xml
+++ b/doc/common/tables/trove-auth_token.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_trove_auth_token">
-    <caption>Description of configuration options for auth_token</caption>
+    <caption>Description of authentication token configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/trove-backup.xml b/doc/common/tables/trove-backup.xml
index 1d5713b9ca..efdd17d082 100644
--- a/doc/common/tables/trove-backup.xml
+++ b/doc/common/tables/trove-backup.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_trove_backup">
-    <caption>Description of configuration options for backup</caption>
+    <caption>Description of backup configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/trove-clients.xml b/doc/common/tables/trove-clients.xml
index c0c43ee154..9d102dd9da 100644
--- a/doc/common/tables/trove-clients.xml
+++ b/doc/common/tables/trove-clients.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_trove_clients">
-    <caption>Description of configuration options for clients</caption>
+    <caption>Description of clients configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/trove-common.xml b/doc/common/tables/trove-common.xml
index d5ad87ef0f..5404479bf5 100644
--- a/doc/common/tables/trove-common.xml
+++ b/doc/common/tables/trove-common.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_trove_common">
-    <caption>Description of configuration options for common</caption>
+    <caption>Description of common configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
@@ -30,7 +30,7 @@
         <td>(StrOpt) The default datastore id or name to use if one is not provided by the user. If the default value is None, the field becomes required in the instance-create request.</td>
       </tr>
       <tr>
-        <td>default_log_levels = amqp=WARN, amqplib=WARN, boto=WARN, qpid=WARN, sqlalchemy=WARN, suds=INFO, oslo.messaging=INFO, iso8601=WARN, requests.packages.urllib3.connectionpool=WARN</td>
+        <td>default_log_levels = 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</td>
         <td>(ListOpt) List of logger=LEVEL pairs.</td>
       </tr>
       <tr>
diff --git a/doc/common/tables/trove-compute.xml b/doc/common/tables/trove-compute.xml
index cdde818abd..cedbcee44e 100644
--- a/doc/common/tables/trove-compute.xml
+++ b/doc/common/tables/trove-compute.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_trove_compute">
-    <caption>Description of configuration options for compute</caption>
+    <caption>Description of Compute configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/trove-database.xml b/doc/common/tables/trove-database.xml
index 2ff4555d2e..b84394611b 100644
--- a/doc/common/tables/trove-database.xml
+++ b/doc/common/tables/trove-database.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_trove_database">
-    <caption>Description of configuration options for database</caption>
+    <caption>Description of database configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/trove-db_cassandra.xml b/doc/common/tables/trove-db_cassandra.xml
index 1502a76ca8..4495f45302 100644
--- a/doc/common/tables/trove-db_cassandra.xml
+++ b/doc/common/tables/trove-db_cassandra.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_trove_db_cassandra">
-    <caption>Description of configuration options for db_cassandra</caption>
+    <caption>Description of Cassandra database configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
@@ -29,6 +29,10 @@
         <td>mount_point = /var/lib/cassandra</td>
         <td>(StrOpt) Filesystem path for mounting volumes if volume support is enabled.</td>
       </tr>
+      <tr>
+        <td>replication_strategy = None</td>
+        <td>(StrOpt) Default strategy for replication.</td>
+      </tr>
       <tr>
         <td>tcp_ports = 7000, 7001, 9042, 9160</td>
         <td>(ListOpt) List of TCP ports and/or port ranges to open in the security group (only applicable if trove_security_groups_support is True).</td>
diff --git a/doc/common/tables/trove-db_couchbase.xml b/doc/common/tables/trove-db_couchbase.xml
index a9954f869b..2c08e96075 100644
--- a/doc/common/tables/trove-db_couchbase.xml
+++ b/doc/common/tables/trove-db_couchbase.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_trove_db_couchbase">
-    <caption>Description of configuration options for db_couchbase</caption>
+    <caption>Description of Couchbase database configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
@@ -33,6 +33,10 @@
         <td>mount_point = /var/lib/couchbase</td>
         <td>(StrOpt) Filesystem path for mounting volumes if volume support is enabled.</td>
       </tr>
+      <tr>
+        <td>replication_strategy = None</td>
+        <td>(StrOpt) Default strategy for replication.</td>
+      </tr>
       <tr>
         <td>restore_namespace = trove.guestagent.strategies.restore.couchbase_impl</td>
         <td>(StrOpt) No help text available for this option.</td>
diff --git a/doc/common/tables/trove-db_mongodb.xml b/doc/common/tables/trove-db_mongodb.xml
index 63a95a928b..d5d5c067ee 100644
--- a/doc/common/tables/trove-db_mongodb.xml
+++ b/doc/common/tables/trove-db_mongodb.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_trove_db_mongodb">
-    <caption>Description of configuration options for db_mongodb</caption>
+    <caption>Description of MongoDB database configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
@@ -29,6 +29,10 @@
         <td>mount_point = /var/lib/mongodb</td>
         <td>(StrOpt) Filesystem path for mounting volumes if volume support is enabled.</td>
       </tr>
+      <tr>
+        <td>replication_strategy = None</td>
+        <td>(StrOpt) Default strategy for replication.</td>
+      </tr>
       <tr>
         <td>tcp_ports = 2500, 27017</td>
         <td>(ListOpt) List of TCP ports and/or port ranges to open in the security group (only applicable if trove_security_groups_support is True).</td>
diff --git a/doc/common/tables/trove-db_mysql.xml b/doc/common/tables/trove-db_mysql.xml
index 69649cf726..c095f8caec 100644
--- a/doc/common/tables/trove-db_mysql.xml
+++ b/doc/common/tables/trove-db_mysql.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_trove_db_mysql">
-    <caption>Description of configuration options for db_mysql</caption>
+    <caption>Description of MySQL database configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
@@ -33,6 +33,22 @@
         <td>mount_point = /var/lib/mysql</td>
         <td>(StrOpt) Filesystem path for mounting volumes if volume support is enabled.</td>
       </tr>
+      <tr>
+        <td>replication_namespace = trove.guestagent.strategies.replication.mysql_binlog</td>
+        <td>(StrOpt) Namespace to load replication strategies from.</td>
+      </tr>
+      <tr>
+        <td>replication_password = NETOU7897NNLOU</td>
+        <td>(StrOpt) Password for replication slave user.</td>
+      </tr>
+      <tr>
+        <td>replication_strategy = MysqlBinlogReplication</td>
+        <td>(StrOpt) Default strategy for replication.</td>
+      </tr>
+      <tr>
+        <td>replication_user = slave_user</td>
+        <td>(StrOpt) Userid for replication slave.</td>
+      </tr>
       <tr>
         <td>restore_namespace = trove.guestagent.strategies.restore.mysql_impl</td>
         <td>(StrOpt) No help text available for this option.</td>
diff --git a/doc/common/tables/trove-db_percona.xml b/doc/common/tables/trove-db_percona.xml
index 6b13f5f710..7eff378c67 100644
--- a/doc/common/tables/trove-db_percona.xml
+++ b/doc/common/tables/trove-db_percona.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_trove_db_percona">
-    <caption>Description of configuration options for db_percona</caption>
+    <caption>Description of Percona database configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
@@ -33,6 +33,22 @@
         <td>mount_point = /var/lib/mysql</td>
         <td>(StrOpt) Filesystem path for mounting volumes if volume support is enabled.</td>
       </tr>
+      <tr>
+        <td>replication_namespace = trove.guestagent.strategies.replication.mysql_binlog</td>
+        <td>(StrOpt) Namespace to load replication strategies from.</td>
+      </tr>
+      <tr>
+        <td>replication_password = NETOU7897NNLOU</td>
+        <td>(StrOpt) Password for replication slave user.</td>
+      </tr>
+      <tr>
+        <td>replication_strategy = MysqlBinlogReplication</td>
+        <td>(StrOpt) Default strategy for replication.</td>
+      </tr>
+      <tr>
+        <td>replication_user = slave_user</td>
+        <td>(StrOpt) Userid for replication slave.</td>
+      </tr>
       <tr>
         <td>restore_namespace = trove.guestagent.strategies.restore.mysql_impl</td>
         <td>(StrOpt) No help text available for this option.</td>
diff --git a/doc/common/tables/trove-db_redis.xml b/doc/common/tables/trove-db_redis.xml
index 9e794edad9..378b7b3904 100644
--- a/doc/common/tables/trove-db_redis.xml
+++ b/doc/common/tables/trove-db_redis.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_trove_db_redis">
-    <caption>Description of configuration options for db_redis</caption>
+    <caption>Description of Redis database configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
@@ -29,6 +29,10 @@
         <td>mount_point = /var/lib/redis</td>
         <td>(StrOpt) Filesystem path for mounting volumes if volume support is enabled.</td>
       </tr>
+      <tr>
+        <td>replication_strategy = None</td>
+        <td>(StrOpt) Default strategy for replication.</td>
+      </tr>
       <tr>
         <td>tcp_ports = 6379</td>
         <td>(ListOpt) List of TCP ports and/or port ranges to open in the security group (only applicable if trove_security_groups_support is True).</td>
diff --git a/doc/common/tables/trove-debug.xml b/doc/common/tables/trove-debug.xml
index 7138180ea6..a67a4939cc 100644
--- a/doc/common/tables/trove-debug.xml
+++ b/doc/common/tables/trove-debug.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_trove_debug">
-    <caption>Description of configuration options for debug</caption>
+    <caption>Description of debug configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/trove-dns.xml b/doc/common/tables/trove-dns.xml
index 84043ecac3..552cdaebe3 100644
--- a/doc/common/tables/trove-dns.xml
+++ b/doc/common/tables/trove-dns.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_trove_dns">
-    <caption>Description of configuration options for dns</caption>
+    <caption>Description of DNS configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/trove-guestagent.xml b/doc/common/tables/trove-guestagent.xml
index ba48d4838a..b7720b6a8b 100644
--- a/doc/common/tables/trove-guestagent.xml
+++ b/doc/common/tables/trove-guestagent.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_trove_guestagent">
-    <caption>Description of configuration options for guestagent</caption>
+    <caption>Description of guest agent configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/trove-heat.xml b/doc/common/tables/trove-heat.xml
index 8e07596be4..2e31401220 100644
--- a/doc/common/tables/trove-heat.xml
+++ b/doc/common/tables/trove-heat.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_trove_heat">
-    <caption>Description of configuration options for heat</caption>
+    <caption>Description of Orchestration module configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/trove-logging.xml b/doc/common/tables/trove-logging.xml
index ec5108fc36..a115ec0ee0 100644
--- a/doc/common/tables/trove-logging.xml
+++ b/doc/common/tables/trove-logging.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_trove_logging">
-    <caption>Description of configuration options for logging</caption>
+    <caption>Description of logging configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/trove-network.xml b/doc/common/tables/trove-network.xml
index b6d52cb0e3..2da1d1c090 100644
--- a/doc/common/tables/trove-network.xml
+++ b/doc/common/tables/trove-network.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_trove_network">
-    <caption>Description of configuration options for network</caption>
+    <caption>Description of network configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/trove-nova.xml b/doc/common/tables/trove-nova.xml
index 1572307406..617a0e2030 100644
--- a/doc/common/tables/trove-nova.xml
+++ b/doc/common/tables/trove-nova.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_trove_nova">
-    <caption>Description of configuration options for nova</caption>
+    <caption>Description of nova configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/trove-qpid.xml b/doc/common/tables/trove-qpid.xml
index 91cd5d9000..8b89ac1092 100644
--- a/doc/common/tables/trove-qpid.xml
+++ b/doc/common/tables/trove-qpid.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_trove_qpid">
-    <caption>Description of configuration options for qpid</caption>
+    <caption>Description of Qpid configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/trove-quota.xml b/doc/common/tables/trove-quota.xml
index f1876e8bb4..581e44db34 100644
--- a/doc/common/tables/trove-quota.xml
+++ b/doc/common/tables/trove-quota.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_trove_quota">
-    <caption>Description of configuration options for quota</caption>
+    <caption>Description of quota configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/trove-rabbitmq.xml b/doc/common/tables/trove-rabbitmq.xml
index 2f1d9372e1..fe282f2a9a 100644
--- a/doc/common/tables/trove-rabbitmq.xml
+++ b/doc/common/tables/trove-rabbitmq.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_trove_rabbitmq">
-    <caption>Description of configuration options for rabbitmq</caption>
+    <caption>Description of RabbitMQ configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/trove-redis.xml b/doc/common/tables/trove-redis.xml
index 57754e951c..b9ebf741fe 100644
--- a/doc/common/tables/trove-redis.xml
+++ b/doc/common/tables/trove-redis.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_trove_redis">
-    <caption>Description of configuration options for redis</caption>
+    <caption>Description of Redis configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/trove-rpc.xml b/doc/common/tables/trove-rpc.xml
index 0177ecee1b..ddd46d45a9 100644
--- a/doc/common/tables/trove-rpc.xml
+++ b/doc/common/tables/trove-rpc.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_trove_rpc">
-    <caption>Description of configuration options for rpc</caption>
+    <caption>Description of RPC configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/trove-ssl.xml b/doc/common/tables/trove-ssl.xml
index a026b1eb43..a24b307983 100644
--- a/doc/common/tables/trove-ssl.xml
+++ b/doc/common/tables/trove-ssl.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_trove_ssl">
-    <caption>Description of configuration options for ssl</caption>
+    <caption>Description of SSL configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/trove-swift.xml b/doc/common/tables/trove-swift.xml
index af6e1377ff..07616d25d4 100644
--- a/doc/common/tables/trove-swift.xml
+++ b/doc/common/tables/trove-swift.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_trove_swift">
-    <caption>Description of configuration options for swift</caption>
+    <caption>Description of Object Storage configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/trove-taskmanager.xml b/doc/common/tables/trove-taskmanager.xml
index 932152d04d..9f9df514e8 100644
--- a/doc/common/tables/trove-taskmanager.xml
+++ b/doc/common/tables/trove-taskmanager.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_trove_taskmanager">
-    <caption>Description of configuration options for taskmanager</caption>
+    <caption>Description of taskmanager configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/trove-volume.xml b/doc/common/tables/trove-volume.xml
index 473a223b75..811ed9c94e 100644
--- a/doc/common/tables/trove-volume.xml
+++ b/doc/common/tables/trove-volume.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_trove_volume">
-    <caption>Description of configuration options for volume</caption>
+    <caption>Description of volume configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/trove-zeromq.xml b/doc/common/tables/trove-zeromq.xml
index ff41ff48fa..651d84f465 100644
--- a/doc/common/tables/trove-zeromq.xml
+++ b/doc/common/tables/trove-zeromq.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_trove_zeromq">
-    <caption>Description of configuration options for zeromq</caption>
+    <caption>Description of ZeroMQ configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/tools/autogenerate-config-flagmappings/trove.flagmappings b/tools/autogenerate-config-flagmappings/trove.flagmappings
index dbabefd458..54bb56a4c8 100644
--- a/tools/autogenerate-config-flagmappings/trove.flagmappings
+++ b/tools/autogenerate-config-flagmappings/trove.flagmappings
@@ -216,6 +216,7 @@ volume_time_out volume
 cassandra/backup_strategy db_cassandra
 cassandra/device_path db_cassandra
 cassandra/mount_point db_cassandra
+cassandra/replication_strategy db_cassandra
 cassandra/tcp_ports db_cassandra
 cassandra/udp_ports db_cassandra
 cassandra/usage_timeout db_cassandra
@@ -224,6 +225,7 @@ couchbase/backup_namespace db_couchbase
 couchbase/backup_strategy db_couchbase
 couchbase/device_path db_couchbase
 couchbase/mount_point db_couchbase
+couchbase/replication_strategy db_couchbase
 couchbase/restore_namespace db_couchbase
 couchbase/root_on_create db_couchbase
 couchbase/tcp_ports db_couchbase
@@ -266,6 +268,7 @@ matchmaker_ring/ringfile redis
 mongodb/backup_strategy db_mongodb
 mongodb/device_path db_mongodb
 mongodb/mount_point db_mongodb
+mongodb/replication_strategy db_mongodb
 mongodb/tcp_ports db_mongodb
 mongodb/udp_ports db_mongodb
 mongodb/usage_timeout db_mongodb
@@ -274,6 +277,10 @@ mysql/backup_namespace db_mysql
 mysql/backup_strategy db_mysql
 mysql/device_path db_mysql
 mysql/mount_point db_mysql
+mysql/replication_namespace db_mysql
+mysql/replication_password db_mysql
+mysql/replication_strategy db_mysql
+mysql/replication_user db_mysql
 mysql/restore_namespace db_mysql
 mysql/root_on_create db_mysql
 mysql/tcp_ports db_mysql
@@ -284,6 +291,10 @@ percona/backup_namespace db_percona
 percona/backup_strategy db_percona
 percona/device_path db_percona
 percona/mount_point db_percona
+percona/replication_namespace db_percona
+percona/replication_password db_percona
+percona/replication_strategy db_percona
+percona/replication_user db_percona
 percona/restore_namespace db_percona
 percona/root_on_create db_percona
 percona/tcp_ports db_percona
@@ -293,6 +304,7 @@ percona/volume_support db_percona
 redis/backup_strategy db_redis
 redis/device_path db_redis
 redis/mount_point db_redis
+redis/replication_strategy db_redis
 redis/tcp_ports db_redis
 redis/udp_ports db_redis
 redis/usage_timeout db_redis
diff --git a/tools/autogenerate-config-flagmappings/trove.headers b/tools/autogenerate-config-flagmappings/trove.headers
new file mode 100644
index 0000000000..963cd6137b
--- /dev/null
+++ b/tools/autogenerate-config-flagmappings/trove.headers
@@ -0,0 +1,32 @@
+Unknown UNKNOWN
+amqp AMQP
+api API
+auth_token authentication token
+backup backup
+clients clients
+common common
+compute Compute
+database database
+db_cassandra Cassandra database
+db_couchbase Couchbase database
+db_mongodb MongoDB database
+db_mysql MySQL database
+db_percona Percona database
+db_redis Redis database
+debug debug
+dns DNS
+guestagent guest agent
+heat Orchestration module
+logging logging
+network network
+nova nova
+qpid Qpid
+quota quota
+rabbitmq RabbitMQ
+redis Redis
+rpc RPC
+ssl SSL
+swift Object Storage
+taskmanager taskmanager
+volume volume
+zeromq ZeroMQ