diff --git a/trove/locale/fr/LC_MESSAGES/trove-log-error.po b/trove/locale/fr/LC_MESSAGES/trove-log-error.po
index 0fa93b2ff6..0412941015 100644
--- a/trove/locale/fr/LC_MESSAGES/trove-log-error.po
+++ b/trove/locale/fr/LC_MESSAGES/trove-log-error.po
@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trove 5.0.0.dev47\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-11-05 06:14+0000\n"
-"PO-Revision-Date: 2015-07-24 09:45+0000\n"
-"Last-Translator: Corinne Verheyde <cverheyd@hotmail.com>\n"
-"Language-Team: French\n"
-"Language: fr\n"
+"POT-Creation-Date: 2015-09-24 09:51+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2015-07-24 09:45+0000\n"
+"Last-Translator: Corinne Verheyde <cverheyd@hotmail.com>\n"
+"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "Generated-By: Babel 2.0\n"
-"X-Generator: Zanata 3.7.1\n"
+"X-Generator: Zanata 3.7.3\n"
+"Language-Team: French\n"
 
 #, python-format
 msgid "Could not find nova server_id(%s)."
diff --git a/trove/locale/fr/LC_MESSAGES/trove-log-info.po b/trove/locale/fr/LC_MESSAGES/trove-log-info.po
index abf89ca331..c5fad76a08 100644
--- a/trove/locale/fr/LC_MESSAGES/trove-log-info.po
+++ b/trove/locale/fr/LC_MESSAGES/trove-log-info.po
@@ -11,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trove 5.0.0.dev47\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-11-05 06:14+0000\n"
-"PO-Revision-Date: 2015-09-22 11:06+0000\n"
-"Last-Translator: Corinne Verheyde <cverheyd@gmail.com>\n"
-"Language-Team: French\n"
-"Language: fr\n"
+"POT-Creation-Date: 2015-09-24 09:51+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2015-09-22 11:06+0000\n"
+"Last-Translator: Corinne Verheyde <cverheyd@gmail.com>\n"
+"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "Generated-By: Babel 2.0\n"
-"X-Generator: Zanata 3.7.1\n"
+"X-Generator: Zanata 3.7.3\n"
+"Language-Team: French\n"
 
 #, python-format
 msgid "Creating a database instance for tenant '%s'"
diff --git a/trove/locale/fr/LC_MESSAGES/trove-log-warning.po b/trove/locale/fr/LC_MESSAGES/trove-log-warning.po
index ae9e8082a7..a69a3a6216 100644
--- a/trove/locale/fr/LC_MESSAGES/trove-log-warning.po
+++ b/trove/locale/fr/LC_MESSAGES/trove-log-warning.po
@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trove 5.0.0.dev47\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-11-05 06:14+0000\n"
-"PO-Revision-Date: 2015-07-24 10:07+0000\n"
-"Last-Translator: Corinne Verheyde <cverheyd@hotmail.com>\n"
-"Language-Team: French\n"
-"Language: fr\n"
+"POT-Creation-Date: 2015-09-24 09:51+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2015-07-24 10:07+0000\n"
+"Last-Translator: Corinne Verheyde <cverheyd@hotmail.com>\n"
+"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "Generated-By: Babel 2.0\n"
-"X-Generator: Zanata 3.7.1\n"
+"X-Generator: Zanata 3.7.3\n"
+"Language-Team: French\n"
 
 #, python-format
 msgid "Could not load instance %s."
diff --git a/trove/locale/trove-log-warning.pot b/trove/locale/trove-log-warning.pot
index caa22ae1de..d7e8018fac 100644
--- a/trove/locale/trove-log-warning.pot
+++ b/trove/locale/trove-log-warning.pot
@@ -1,34 +1,34 @@
 # Translations template for trove.
-# Copyright (C) 2015 ORGANIZATION
+# Copyright (C) 2016 ORGANIZATION
 # This file is distributed under the same license as the trove project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: trove 4.0.0.0b3.dev14\n"
+"Project-Id-Version: trove 5.0.0.0b2\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-08-03 06:13+0000\n"
+"POT-Creation-Date: 2016-01-22 06:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.0\n"
+"Generated-By: Babel 2.2.0\n"
 
-#: trove/common/profile.py:38
+#: trove/common/profile.py:39
 msgid ""
 "The OpenStack Profiler is enabled. Using one of the hmac_keys specified "
-"in the api-paste.ini file (typically in /etc/trove), a trace can be made "
-"of all requests. Only an admin user can retrieve the trace information, "
+"in the trove.conf file (typically in /etc/trove), a trace can be made of "
+"all requests. Only an admin user can retrieve the trace information, "
 "however.\n"
 "To disable the profiler, add the following to the configuration file:\n"
 "[profiler]\n"
 "enabled=false"
 msgstr ""
 
-#: trove/instance/models.py:458
+#: trove/instance/models.py:459
 #, python-format
 msgid "Could not load instance %s."
 msgstr ""
diff --git a/trove/locale/trove.pot b/trove/locale/trove.pot
index 58f12f24f3..789c90235c 100644
--- a/trove/locale/trove.pot
+++ b/trove/locale/trove.pot
@@ -1,21 +1,21 @@
 # Translations template for trove.
-# Copyright (C) 2015 ORGANIZATION
+# Copyright (C) 2016 ORGANIZATION
 # This file is distributed under the same license as the trove project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: trove 5.0.0.dev33\n"
+"Project-Id-Version: trove 5.0.0.0b2\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-11-05 06:14+0000\n"
+"POT-Creation-Date: 2016-01-22 06:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.1.1\n"
+"Generated-By: Babel 2.2.0\n"
 
 #: trove/backup/models.py:97
 #, python-format
@@ -49,7 +49,7 @@ msgstr ""
 
 #: trove/cluster/models.py:208
 #: trove/common/strategies/cluster/experimental/mongodb/api.py:245
-#: trove/common/strategies/cluster/experimental/mongodb/api.py:448
+#: trove/common/strategies/cluster/experimental/mongodb/api.py:450
 #, python-format
 msgid ""
 "This action cannot be performed on the cluster while the current cluster "
@@ -138,12 +138,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: trove/cmd/manage.py:223
+#: trove/cmd/manage.py:225
 #, python-format
 msgid "Possible wrong number of arguments supplied %s."
 msgstr ""
 
-#: trove/cmd/manage.py:226
+#: trove/cmd/manage.py:228
 msgid "Command failed, please check log for more info."
 msgstr ""
 
@@ -198,13 +198,13 @@ msgstr ""
 msgid "cannot understand XML"
 msgstr ""
 
-#: trove/common/debug_utils.py:100
+#: trove/common/debug_utils.py:99
 msgid ""
-"Enabling debugging with eventlet monkey patched could produce unexpected "
+"Enabling debugging with eventlet monkey patched produce unexpected "
 "behavior."
 msgstr ""
 
-#: trove/common/debug_utils.py:121
+#: trove/common/debug_utils.py:120
 #, python-format
 msgid ""
 "Can't connect to remote debug server. Continuing to work in standard "
@@ -277,15 +277,15 @@ msgstr ""
 #: trove/common/exception.py:124
 #, python-format
 msgid ""
-"Datastore '%(datastore)s' version id %(version_id)s and flavor "
-"%(flavor_id)s mapping not found."
+"Flavor %(flavor_id)s is not supported for datastore %(datastore)s version"
+" %(datastore_version)s"
 msgstr ""
 
 #: trove/common/exception.py:130
 #, python-format
 msgid ""
-"Datastore '%(datastore)s' version %(datastore_version)s and flavor "
-"%(flavor_id)s mapping already exists."
+"Flavor %(flavor_id)s is already associated with datastore %(datastore)s "
+"version %(datastore_version)s"
 msgstr ""
 
 #: trove/common/exception.py:136
@@ -383,7 +383,8 @@ msgid "No change was requested in the size of the instance."
 msgstr ""
 
 #: trove/common/exception.py:240
-msgid "Cannot find the volumes attached to compute instance %(server_id)."
+#, python-format
+msgid "Cannot find the volumes attached to compute instance %(server_id)s."
 msgstr ""
 
 #: trove/common/exception.py:246
@@ -729,12 +730,12 @@ msgstr ""
 msgid "This request was rate-limited."
 msgstr ""
 
-#: trove/common/template.py:136
+#: trove/common/template.py:137
 #, python-format
 msgid "Missing heat template for %(s_datastore_manager)s."
 msgstr ""
 
-#: trove/common/utils.py:235
+#: trove/common/utils.py:243
 #, python-format
 msgid ""
 "Command '%(cmd)s' failed. %(description)s Exit code: %(exit_code)s\n"
@@ -742,11 +743,11 @@ msgid ""
 "stdout: %(stdout)s"
 msgstr ""
 
-#: trove/common/utils.py:244
+#: trove/common/utils.py:252
 msgid "Got a timeout but not the one expected."
 msgstr ""
 
-#: trove/common/utils.py:247
+#: trove/common/utils.py:255
 #, python-format
 msgid ""
 "Time out after waiting %(time)s seconds when running proc: %(args)s "
@@ -824,30 +825,30 @@ msgid ""
 "%(shard)s has members: %(instances)s"
 msgstr ""
 
-#: trove/common/strategies/cluster/experimental/mongodb/api.py:476
+#: trove/common/strategies/cluster/experimental/mongodb/api.py:478
 #, python-format
 msgid "Replica instance does not have required field(s) %s."
 msgstr ""
 
-#: trove/common/strategies/cluster/experimental/mongodb/api.py:484
+#: trove/common/strategies/cluster/experimental/mongodb/api.py:486
 #, python-format
 msgid "Instance type %s not supported for MongoDB cluster grow."
 msgstr ""
 
-#: trove/common/strategies/cluster/experimental/mongodb/api.py:515
+#: trove/common/strategies/cluster/experimental/mongodb/api.py:517
 msgid "Duplicate member names not allowed."
 msgstr ""
 
-#: trove/common/strategies/cluster/experimental/mongodb/api.py:520
+#: trove/common/strategies/cluster/experimental/mongodb/api.py:522
 #, python-format
 msgid "related_to target(s) %(targets)s do not match any specified names."
 msgstr ""
 
-#: trove/common/strategies/cluster/experimental/mongodb/api.py:542
+#: trove/common/strategies/cluster/experimental/mongodb/api.py:544
 msgid "Members of the same shard have mismatching flavorRef and/or volume values."
 msgstr ""
 
-#: trove/common/strategies/cluster/experimental/mongodb/api.py:576
+#: trove/common/strategies/cluster/experimental/mongodb/api.py:578
 #, python-format
 msgid ""
 "Shard with instance %s is still active. Please remove the shard from the "
@@ -894,13 +895,13 @@ msgstr ""
 
 #: trove/common/strategies/cluster/experimental/pxc/taskmanager.py:130
 #: trove/common/strategies/cluster/experimental/redis/taskmanager.py:88
-#: trove/common/strategies/cluster/experimental/vertica/taskmanager.py:86
+#: trove/common/strategies/cluster/experimental/vertica/taskmanager.py:92
 msgid "Error creating cluster."
 msgstr ""
 
 #: trove/common/strategies/cluster/experimental/pxc/taskmanager.py:140
 #: trove/common/strategies/cluster/experimental/redis/taskmanager.py:98
-#: trove/common/strategies/cluster/experimental/vertica/taskmanager.py:96
+#: trove/common/strategies/cluster/experimental/vertica/taskmanager.py:102
 msgid "Timeout for building cluster."
 msgstr ""
 
@@ -917,6 +918,30 @@ msgstr ""
 msgid "Error growing cluster %s."
 msgstr ""
 
+#: trove/common/strategies/storage/swift.py:132
+#, python-format
+msgid ""
+"Error saving data segment to swift. ETAG: %(tag)s Segment MD5: "
+"%(checksum)s."
+msgstr ""
+
+#: trove/common/strategies/storage/swift.py:163
+#, python-format
+msgid "Error saving data to swift. Manifest ETAG: %(tag)s Swift MD5: %(checksum)s"
+msgstr ""
+
+#: trove/common/strategies/storage/swift.py:180
+#, python-format
+msgid ""
+"Original checksum: %(original)s does not match the current checksum: "
+"%(current)s"
+msgstr ""
+
+#: trove/common/strategies/storage/swift.py:237
+#, python-format
+msgid "Writing metadata: %s"
+msgstr ""
+
 #: trove/conductor/manager.py:50
 #, python-format
 msgid "[Instance %s] sent field not present. Cannot compare."
@@ -1037,7 +1062,7 @@ msgstr ""
 msgid "Capability Override not found for capability %s"
 msgstr ""
 
-#: trove/datastore/models.py:667
+#: trove/datastore/models.py:676
 msgid "Specify both the datastore and datastore_version_id."
 msgstr ""
 
@@ -1056,9 +1081,16 @@ msgstr ""
 msgid "Tenant %(s_tenant)s cannot access %(s_name)s"
 msgstr ""
 
-#: trove/db/sqlalchemy/session.py:82
+#: trove/db/sqlalchemy/session.py:86
 #, python-format
-msgid "Creating SQLAlchemy engine with args: %s"
+msgid ""
+"Configuration option \"query_log\" has been depracated. Use "
+"\"connection_debug\" instead. Setting connection_debug = %(debug_level)s "
+"instead."
+msgstr ""
+
+#: trove/db/sqlalchemy/session.py:104
+msgid "***The Database has not been setup!!!***"
 msgstr ""
 
 #: trove/dns/models.py:69
@@ -1290,7 +1322,7 @@ msgstr ""
 msgid "Failed to create remote security group."
 msgstr ""
 
-#: trove/extensions/security_group/models.py:77 trove/taskmanager/models.py:715
+#: trove/extensions/security_group/models.py:77 trove/taskmanager/models.py:719
 #, python-format
 msgid "Security Group for %s"
 msgstr ""
@@ -1320,7 +1352,7 @@ msgstr ""
 msgid "Error calling %s"
 msgstr ""
 
-#: trove/guestagent/dbaas.py:92
+#: trove/guestagent/dbaas.py:94
 msgid "Error getting volume stats."
 msgstr ""
 
@@ -1412,555 +1444,506 @@ msgstr ""
 msgid "Error restoring backup %(id)s."
 msgstr ""
 
-#: trove/guestagent/common/operating_system.py:61
+#: trove/guestagent/common/operating_system.py:62
 #, python-format
 msgid "File does not exist: %s"
 msgstr ""
 
-#: trove/guestagent/common/operating_system.py:106
+#: trove/guestagent/common/operating_system.py:132
 #, python-format
 msgid "Invalid path: %s"
 msgstr ""
 
-#: trove/guestagent/common/operating_system.py:286
+#: trove/guestagent/common/operating_system.py:313
 #, python-format
 msgid "Service control command not available: %s"
 msgstr ""
 
-#: trove/guestagent/common/operating_system.py:289
+#: trove/guestagent/common/operating_system.py:316
 msgid "Candidate service names not specified."
 msgstr ""
 
-#: trove/guestagent/common/operating_system.py:382
+#: trove/guestagent/common/operating_system.py:409
 msgid "Cannot create a blank directory."
 msgstr ""
 
-#: trove/guestagent/common/operating_system.py:411
+#: trove/guestagent/common/operating_system.py:438
 msgid "Cannot change ownership of a blank file or directory."
 msgstr ""
 
-#: trove/guestagent/common/operating_system.py:414
+#: trove/guestagent/common/operating_system.py:441
 msgid "Please specify owner or group, or both."
 msgstr ""
 
-#: trove/guestagent/common/operating_system.py:470
+#: trove/guestagent/common/operating_system.py:497
 msgid "Cannot change mode of a blank file."
 msgstr ""
 
-#: trove/guestagent/common/operating_system.py:500
+#: trove/guestagent/common/operating_system.py:528
+msgid "Missing user."
+msgstr ""
+
+#: trove/guestagent/common/operating_system.py:530
+msgid "Missing group."
+msgstr ""
+
+#: trove/guestagent/common/operating_system.py:563
 msgid "No file mode specified."
 msgstr ""
 
-#: trove/guestagent/common/operating_system.py:524
+#: trove/guestagent/common/operating_system.py:587
 msgid "Cannot remove a blank file."
 msgstr ""
 
-#: trove/guestagent/common/operating_system.py:548
-#: trove/guestagent/common/operating_system.py:585
+#: trove/guestagent/common/operating_system.py:611
+#: trove/guestagent/common/operating_system.py:648
 msgid "Missing source path."
 msgstr ""
 
-#: trove/guestagent/common/operating_system.py:550
-#: trove/guestagent/common/operating_system.py:587
+#: trove/guestagent/common/operating_system.py:613
+#: trove/guestagent/common/operating_system.py:650
 msgid "Missing destination path."
 msgstr ""
 
-#: trove/guestagent/common/operating_system.py:626
+#: trove/guestagent/common/operating_system.py:725
 #, python-format
 msgid "Got unknown keyword args: %r"
 msgstr ""
 
-#: trove/guestagent/datastore/manager.py:103
+#: trove/guestagent/datastore/manager.py:130
 #, python-format
 msgid "Starting datastore prepare for '%s'."
 msgstr ""
 
-#: trove/guestagent/datastore/manager.py:113
+#: trove/guestagent/datastore/manager.py:140
 #, python-format
 msgid "An error occurred preparing datastore: %s"
 msgstr ""
 
-#: trove/guestagent/datastore/manager.py:117
+#: trove/guestagent/datastore/manager.py:144
 #, python-format
 msgid "Ending datastore prepare for '%s'."
 msgstr ""
 
-#: trove/guestagent/datastore/manager.py:124
-msgid "Completed setup of datastore successfully."
+#: trove/guestagent/datastore/manager.py:151
+#, python-format
+msgid "Completed setup of '%s' datastore successfully."
 msgstr ""
 
-#: trove/guestagent/datastore/manager.py:137
+#: trove/guestagent/datastore/manager.py:159
+msgid "Creating databases (called from 'prepare')."
+msgstr ""
+
+#: trove/guestagent/datastore/manager.py:161
+msgid "Databases created successfully."
+msgstr ""
+
+#: trove/guestagent/datastore/manager.py:163
+msgid "Creating users (called from 'prepare')"
+msgstr ""
+
+#: trove/guestagent/datastore/manager.py:165
+msgid "Users created successfully."
+msgstr ""
+
+#: trove/guestagent/datastore/manager.py:167
 #, python-format
 msgid "An error occurred creating databases/users: %s"
 msgstr ""
 
-#: trove/guestagent/datastore/manager.py:148
+#: trove/guestagent/datastore/manager.py:172
+#, python-format
+msgid "Calling post_prepare for '%s' datastore."
+msgstr ""
+
+#: trove/guestagent/datastore/manager.py:178
+#, python-format
+msgid "Post prepare for '%s' datastore completed."
+msgstr ""
+
+#: trove/guestagent/datastore/manager.py:181
 #, python-format
 msgid "An error occurred in post prepare: %s"
 msgstr ""
 
-#: trove/guestagent/datastore/service.py:119
+#: trove/guestagent/datastore/manager.py:211
+msgid "No post_prepare work has been defined."
+msgstr ""
+
+#: trove/guestagent/datastore/service.py:118
 #, python-format
 msgid "Set final status to %s."
 msgstr ""
 
-#: trove/guestagent/datastore/service.py:126
+#: trove/guestagent/datastore/service.py:125
 msgid "Ending restart."
 msgstr ""
 
-#: trove/guestagent/datastore/service.py:134
+#: trove/guestagent/datastore/service.py:133
 #, python-format
 msgid "Current database status is '%s'."
 msgstr ""
 
-#: trove/guestagent/datastore/service.py:183
+#: trove/guestagent/datastore/service.py:182
 msgid ""
 "DB server is not installed or is in restart mode, so for now we'll skip "
 "determining the status of DB on this instance."
 msgstr ""
 
-#: trove/guestagent/datastore/service.py:213
+#: trove/guestagent/datastore/service.py:212
 msgid "Database restart failed."
 msgstr ""
 
-#: trove/guestagent/datastore/service.py:240
+#: trove/guestagent/datastore/service.py:239
 msgid "Starting database service."
 msgstr ""
 
-#: trove/guestagent/datastore/service.py:246
-msgid "Database failed to start."
-msgstr ""
-
-#: trove/guestagent/datastore/service.py:248
-msgid "Database has started successfully."
-msgstr ""
-
-#: trove/guestagent/datastore/service.py:251
+#: trove/guestagent/datastore/service.py:245
 msgid "Enable service auto-start on boot."
 msgstr ""
 
-#: trove/guestagent/datastore/service.py:274
+#: trove/guestagent/datastore/service.py:262
+msgid "Database failed to start."
+msgstr ""
+
+#: trove/guestagent/datastore/service.py:264
+msgid "Database has started successfully."
+msgstr ""
+
+#: trove/guestagent/datastore/service.py:286
 msgid "Stopping database service."
 msgstr ""
 
-#: trove/guestagent/datastore/service.py:280
+#: trove/guestagent/datastore/service.py:292
 msgid "Database failed to stop."
 msgstr ""
 
-#: trove/guestagent/datastore/service.py:282
+#: trove/guestagent/datastore/service.py:294
 msgid "Database has stopped successfully."
 msgstr ""
 
-#: trove/guestagent/datastore/service.py:285
+#: trove/guestagent/datastore/service.py:297
 msgid "Disable service auto-start on boot."
 msgstr ""
 
-#: trove/guestagent/datastore/service.py:304
+#: trove/guestagent/datastore/service.py:316
 #, python-format
 msgid ""
 "Service status did not change to %(status)s within the given timeout: "
 "%(timeout)ds"
 msgstr ""
 
-#: trove/guestagent/datastore/service.py:336
-msgid "Timeout while waiting for database status to change."
+#: trove/guestagent/datastore/service.py:365
+#, python-format
+msgid ""
+"Timeout while waiting for database status to change.Expected state "
+"%(status)s, current state is %(actual_status)s"
 msgstr ""
 
 #: trove/guestagent/datastore/experimental/cassandra/service.py:51
 msgid "Preparing Guest as a Cassandra Server"
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/cassandra/service.py:68
+#: trove/guestagent/datastore/experimental/cassandra/service.py:60
 msgid "Error while initiating storage structure."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/cassandra/service.py:76
-msgid "Error starting Cassandra"
-msgstr ""
-
-#: trove/guestagent/datastore/experimental/cassandra/service.py:88
-msgid "Error killing Cassandra start command."
-msgstr ""
-
-#: trove/guestagent/datastore/experimental/cassandra/service.py:90
-msgid "Could not start Cassandra"
-msgstr ""
-
-#: trove/guestagent/datastore/experimental/cassandra/service.py:102
-#: trove/guestagent/datastore/experimental/cassandra/service.py:104
-msgid "Could not stop Cassandra."
-msgstr ""
-
-#: trove/guestagent/datastore/experimental/cassandra/service.py:109
-msgid "Restarting Cassandra server."
-msgstr ""
-
-#: trove/guestagent/datastore/experimental/cassandra/service.py:150
+#: trove/guestagent/datastore/experimental/cassandra/service.py:111
 #, python-format
 msgid "Exception generating Cassandra configuration %s."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/cassandra/service.py:157
+#: trove/guestagent/datastore/experimental/cassandra/service.py:118
 msgid "Wrote new Cassandra configuration."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/cassandra/service.py:206
+#: trove/guestagent/datastore/experimental/cassandra/service.py:167
 msgid "Starting Cassandra with configuration changes."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/cassandra/service.py:210
+#: trove/guestagent/datastore/experimental/cassandra/service.py:171
 #, python-format
 msgid "Cannot execute start_db_with_conf_changes because Cassandra state == %s."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/cassandra/service.py:236
+#: trove/guestagent/datastore/experimental/cassandra/service.py:197
 msgid "Error getting Cassandra status"
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/couchbase/manager.py:161
+#: trove/guestagent/datastore/experimental/couchbase/manager.py:105
 #, python-format
 msgid "Restoring database from backup %s"
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/couchbase/manager.py:166
+#: trove/guestagent/datastore/experimental/couchbase/manager.py:110
 #, python-format
 msgid "Error performing restore from backup %s"
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/couchbase/manager.py:171
+#: trove/guestagent/datastore/experimental/couchbase/manager.py:115
 msgid "Restored database successfully"
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/couchbase/service.py:62
+#: trove/guestagent/datastore/experimental/couchbase/service.py:63
 msgid "Preparing Guest as Couchbase Server."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/couchbase/service.py:71
+#: trove/guestagent/datastore/experimental/couchbase/service.py:72
 msgid "Couchbase Server change data dir path."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/couchbase/service.py:90
+#: trove/guestagent/datastore/experimental/couchbase/service.py:91
 msgid "Couchbase Server initial setup finished."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/couchbase/service.py:92
+#: trove/guestagent/datastore/experimental/couchbase/service.py:93
 msgid "Error performing initial Couchbase setup."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/couchbase/service.py:112
-msgid "Enabling Couchbase Server on boot."
-msgstr ""
-
-#: trove/guestagent/datastore/experimental/couchbase/service.py:119
-msgid "Command to enable Couchbase Server on boot not found."
-msgstr ""
-
-#: trove/guestagent/datastore/experimental/couchbase/service.py:152
-#: trove/guestagent/datastore/experimental/couchbase/service.py:154
-msgid "Could not stop Couchbase Server."
-msgstr ""
-
-#: trove/guestagent/datastore/experimental/couchbase/service.py:157
-msgid "Restarting Couchbase Server."
-msgstr ""
-
-#: trove/guestagent/datastore/experimental/couchbase/service.py:169
-msgid "Starting Couchbase Server."
-msgstr ""
-
-#: trove/guestagent/datastore/experimental/couchbase/service.py:185
-msgid "Start up of Couchbase Server failed."
-msgstr ""
-
-#: trove/guestagent/datastore/experimental/couchbase/service.py:189
-msgid "Error killing Couchbase start command."
-msgstr ""
-
-#: trove/guestagent/datastore/experimental/couchbase/service.py:197
+#: trove/guestagent/datastore/experimental/couchbase/service.py:127
 msgid "Starting Couchbase with configuration changes."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/couchbase/service.py:198
+#: trove/guestagent/datastore/experimental/couchbase/service.py:128
 #, python-format
 msgid ""
 "Configuration contents:\n"
 " %s."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/couchbase/service.py:200
+#: trove/guestagent/datastore/experimental/couchbase/service.py:130
 #, python-format
 msgid "Cannot start Couchbase with configuration changes. Couchbase state == %s."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/couchbase/service.py:230
+#: trove/guestagent/datastore/experimental/couchbase/service.py:161
 msgid "Error getting the Couchbase status."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/couchbase/service.py:236
+#: trove/guestagent/datastore/experimental/couchbase/service.py:167
 msgid "Error getting the root password from the native Couchbase config file."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/couchbase/service.py:250
+#: trove/guestagent/datastore/experimental/couchbase/service.py:181
 msgid ""
 "Error getting Couchbase status using the password parsed from the native "
 "Couchbase config file."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/couchbase/service.py:319
+#: trove/guestagent/datastore/experimental/couchbase/service.py:253
 #, python-format
 msgid "An error occurred in saving password (%(errno)s). %(strerror)s."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/couchdb/service.py:61
+#: trove/guestagent/datastore/experimental/couchdb/service.py:62
 msgid "Preparing guest as a CouchDB server."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/couchdb/service.py:65
+#: trove/guestagent/datastore/experimental/couchdb/service.py:66
 msgid "Finished installing CouchDB server."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/couchdb/service.py:101
+#: trove/guestagent/datastore/experimental/couchdb/service.py:86
 msgid "Error changing permissions."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/couchdb/service.py:133
-msgid "Stopping CouchDB."
-msgstr ""
-
-#: trove/guestagent/datastore/experimental/couchdb/service.py:143
-msgid "CouchDB service is not discovered."
-msgstr ""
-
-#: trove/guestagent/datastore/experimental/couchdb/service.py:148
-#: trove/guestagent/datastore/experimental/couchdb/service.py:150
-msgid "Could not stop CouchDB."
-msgstr ""
-
-#: trove/guestagent/datastore/experimental/couchdb/service.py:156
-msgid "Starting CouchDB server."
-msgstr ""
-
-#: trove/guestagent/datastore/experimental/couchdb/service.py:172
-msgid "Start up of CouchDB server failed."
-msgstr ""
-
-#: trove/guestagent/datastore/experimental/couchdb/service.py:177
-msgid "Restarting CouchDB server."
-msgstr ""
-
-#: trove/guestagent/datastore/experimental/couchdb/service.py:194
+#: trove/guestagent/datastore/experimental/couchdb/service.py:111
 msgid "Error while trying to update bind address of CouchDB server."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/couchdb/service.py:205
+#: trove/guestagent/datastore/experimental/couchdb/service.py:122
 msgid "Starting CouchDB with configuration changes."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/couchdb/service.py:232
+#: trove/guestagent/datastore/experimental/couchdb/service.py:150
 msgid "Error getting CouchDB status."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/db2/service.py:62
+#: trove/guestagent/datastore/experimental/db2/service.py:61
 msgid "Command to change ownership of  DB2 data directory failed."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/db2/service.py:70
+#: trove/guestagent/datastore/experimental/db2/service.py:69
 msgid "Command to enable DB2 server on boot failed."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/db2/service.py:78
+#: trove/guestagent/datastore/experimental/db2/service.py:77
 msgid "Command to disable DB2 server on boot failed."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/db2/service.py:89
+#: trove/guestagent/datastore/experimental/db2/service.py:88
 msgid "Starting DB2 with configuration changes."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/db2/service.py:103
+#: trove/guestagent/datastore/experimental/db2/service.py:102
 msgid "Start of DB2 server instance failed."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/db2/service.py:105
+#: trove/guestagent/datastore/experimental/db2/service.py:104
 msgid "Could not start DB2."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/db2/service.py:119
-#: trove/guestagent/datastore/experimental/db2/service.py:121
+#: trove/guestagent/datastore/experimental/db2/service.py:118
+#: trove/guestagent/datastore/experimental/db2/service.py:120
 msgid "Could not stop DB2."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/db2/service.py:147
+#: trove/guestagent/datastore/experimental/db2/service.py:146
 msgid "Error getting the DB2 server status."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/db2/service.py:174
+#: trove/guestagent/datastore/experimental/db2/service.py:173
 #, python-format
 msgid "There was an error creating database: %s."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/db2/service.py:179
+#: trove/guestagent/datastore/experimental/db2/service.py:178
 #, python-format
 msgid "Creating the following databases failed: %s."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/db2/service.py:192
+#: trove/guestagent/datastore/experimental/db2/service.py:191
 #, python-format
 msgid "There was an error while deleting database:%s."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/db2/service.py:194
+#: trove/guestagent/datastore/experimental/db2/service.py:193
 #, python-format
 msgid "Unable to delete database: %s."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/db2/service.py:239
+#: trove/guestagent/datastore/experimental/db2/service.py:238
 #, python-format
 msgid "An error occurred listing databases: %s."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/db2/service.py:257
+#: trove/guestagent/datastore/experimental/db2/service.py:256
 #, python-format
 msgid "Error creating user: %s."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/db2/service.py:275
+#: trove/guestagent/datastore/experimental/db2/service.py:274
 #, python-format
 msgid "An error occurred creating users: %s."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/db2/service.py:311
+#: trove/guestagent/datastore/experimental/db2/service.py:310
 #, python-format
 msgid "There was an error while deleting user: %s."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/db2/service.py:313
+#: trove/guestagent/datastore/experimental/db2/service.py:312
 #, python-format
 msgid "Unable to delete user: %s."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/mongodb/manager.py:185
-#: trove/guestagent/datastore/experimental/redis/manager.py:73
-#: trove/guestagent/datastore/mysql_common/manager.py:138
+#: trove/guestagent/datastore/experimental/mongodb/manager.py:178
+#: trove/guestagent/datastore/experimental/redis/manager.py:52
+#: trove/guestagent/datastore/mysql_common/manager.py:125
 #, python-format
 msgid "Restoring database from backup %s."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/mongodb/manager.py:189
-#: trove/guestagent/datastore/experimental/redis/manager.py:77
-#: trove/guestagent/datastore/mysql_common/manager.py:142
+#: trove/guestagent/datastore/experimental/mongodb/manager.py:182
+#: trove/guestagent/datastore/experimental/redis/manager.py:56
+#: trove/guestagent/datastore/mysql_common/manager.py:129
 #, python-format
 msgid "Error performing restore from backup %s."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/mongodb/manager.py:193
-#: trove/guestagent/datastore/experimental/redis/manager.py:81
-#: trove/guestagent/datastore/mysql_common/manager.py:146
+#: trove/guestagent/datastore/experimental/mongodb/manager.py:186
+#: trove/guestagent/datastore/experimental/redis/manager.py:60
+#: trove/guestagent/datastore/mysql_common/manager.py:133
 msgid "Restored database successfully."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/mongodb/service.py:87
+#: trove/guestagent/datastore/experimental/mongodb/service.py:71
 msgid "Preparing Guest as MongoDB."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/mongodb/service.py:91
+#: trove/guestagent/datastore/experimental/mongodb/service.py:75
 msgid "Finished installing MongoDB server."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/mongodb/service.py:102
-msgid "Enabling MongoDB on boot."
-msgstr ""
-
-#: trove/guestagent/datastore/experimental/mongodb/service.py:108
-#: trove/guestagent/datastore/experimental/mongodb/service.py:130
-msgid "MongoDB service is not discovered."
-msgstr ""
-
-#: trove/guestagent/datastore/experimental/mongodb/service.py:111
-msgid "Disabling MongoDB on boot."
-msgstr ""
-
-#: trove/guestagent/datastore/experimental/mongodb/service.py:120
-msgid "Stopping MongoDB."
-msgstr ""
-
-#: trove/guestagent/datastore/experimental/mongodb/service.py:135
-msgid "Could not stop MongoDB."
-msgstr ""
-
-#: trove/guestagent/datastore/experimental/mongodb/service.py:137
-msgid "Could not stop MongoDB"
-msgstr ""
-
-#: trove/guestagent/datastore/experimental/mongodb/service.py:140
-msgid "Restarting MongoDB."
-msgstr ""
-
-#: trove/guestagent/datastore/experimental/mongodb/service.py:149
-msgid "Starting MongoDB."
-msgstr ""
-
-#: trove/guestagent/datastore/experimental/mongodb/service.py:168
-msgid "Start up of MongoDB failed."
-msgstr ""
-
-#: trove/guestagent/datastore/experimental/mongodb/service.py:178
-msgid "Error killing MongoDB start command."
-msgstr ""
-
-#: trove/guestagent/datastore/experimental/mongodb/service.py:192
+#: trove/guestagent/datastore/experimental/mongodb/service.py:104
 msgid "Starting MongoDB with configuration changes."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/mongodb/service.py:197
-#: trove/guestagent/datastore/experimental/redis/service.py:237
+#: trove/guestagent/datastore/experimental/mongodb/service.py:109
+#: trove/guestagent/datastore/experimental/redis/service.py:197
 msgid "Initiating config."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/mongodb/service.py:206
-#: trove/guestagent/datastore/experimental/redis/service.py:245
-#: trove/guestagent/datastore/mysql_common/service.py:970
-#: trove/guestagent/datastore/mysql_common/service.py:976
-msgid "Resetting configuration."
-msgstr ""
-
-#: trove/guestagent/datastore/experimental/mongodb/service.py:260
+#: trove/guestagent/datastore/experimental/mongodb/service.py:167
 #, python-format
 msgid "Bad cluster configuration; instance type given as %s."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/mongodb/service.py:268
+#: trove/guestagent/datastore/experimental/mongodb/service.py:175
 msgid "Configuring instance as a cluster query router."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/mongodb/service.py:302
+#: trove/guestagent/datastore/experimental/mongodb/service.py:199
 msgid "Configuring instance as a cluster config server."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/mongodb/service.py:308
+#: trove/guestagent/datastore/experimental/mongodb/service.py:205
 msgid "Configuring instance as a cluster member."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/mongodb/service.py:348
+#: trove/guestagent/datastore/experimental/mongodb/service.py:245
 msgid "Error clearing storage."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/mongodb/service.py:364
+#: trove/guestagent/datastore/experimental/mongodb/service.py:261
 #, python-format
 msgid "Setting config servers: %s"
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/mongodb/service.py:492
+#: trove/guestagent/datastore/experimental/mongodb/service.py:389
 msgid "Cannot secure the instance. The service is still running."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/mongodb/service.py:557
+#: trove/guestagent/datastore/experimental/mongodb/service.py:454
 msgid "Error getting MongoDB status."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/mongodb/service.py:601
+#: trove/guestagent/datastore/experimental/mongodb/service.py:512
 msgid "User's password is empty."
 msgstr ""
 
+#: trove/guestagent/datastore/experimental/mongodb/service.py:552
+#, python-format
+msgid "Cannot delete user with reserved name %(user)s"
+msgstr ""
+
+#: trove/guestagent/datastore/experimental/mongodb/service.py:611
+#, python-format
+msgid ""
+"Cannot update attributes for user %(user)s as it either does not exist or"
+" is a reserved user."
+msgstr ""
+
+#: trove/guestagent/datastore/experimental/mongodb/service.py:650
+#, python-format
+msgid "Cannot grant access for reserved or non-existant user %(user)s"
+msgstr ""
+
+#: trove/guestagent/datastore/experimental/mongodb/service.py:671
+#, python-format
+msgid "Cannot revoke access for reserved or non-existant user %(user)s"
+msgstr ""
+
+#: trove/guestagent/datastore/experimental/mongodb/service.py:688
+#, python-format
+msgid "Cannot list access for reserved or non-existant user %(user)s"
+msgstr ""
+
+#: trove/guestagent/datastore/experimental/postgresql/pgutil.py:52
+#, python-format
+msgid "Invalid SQL statement: %s"
+msgstr ""
+
 #: trove/guestagent/datastore/experimental/postgresql/service/access.py:38
 msgid "{guest_id}: Granting user ({user}) access to database ({database})."
 msgstr ""
@@ -1969,58 +1952,58 @@ msgstr ""
 msgid "{guest_id}: Revoking user ({user}) access to database({database})."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/postgresql/service/config.py:107
-msgid "{guest_id}: Going into restart mode for config file changes."
+#: trove/guestagent/datastore/experimental/postgresql/service/config.py:110
+msgid "The service is still running."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/postgresql/service/config.py:117
-msgid "{guest_id}: Ending restart mode for config file changes."
-msgstr ""
-
-#: trove/guestagent/datastore/experimental/postgresql/service/database.py:46
+#: trove/guestagent/datastore/experimental/postgresql/service/database.py:48
 msgid "{guest_id}: Creating database {name}."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/postgresql/service/database.py:68
+#: trove/guestagent/datastore/experimental/postgresql/service/database.py:70
 msgid "{guest_id}: Dropping database {name}."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/postgresql/service/install.py:50
+#: trove/guestagent/datastore/experimental/postgresql/service/install.py:53
 msgid "{guest_id}: Installing ({packages})."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/postgresql/service/users.py:54
-msgid "{guest_id}: Creating user {name} with password {password}."
+#: trove/guestagent/datastore/experimental/postgresql/service/status.py:45
+msgid "Error getting Postgres status."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/postgresql/service/users.py:137
+#: trove/guestagent/datastore/experimental/postgresql/service/users.py:74
+msgid "{guest_id}: Creating user {user} {with_clause}."
+msgstr ""
+
+#: trove/guestagent/datastore/experimental/postgresql/service/users.py:164
 msgid "{guest_id}: Dropping user {name}."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/postgresql/service/users.py:191
-msgid "{guest_id}: Changing password for {user} to {password}."
+#: trove/guestagent/datastore/experimental/postgresql/service/users.py:219
+msgid "{guest_id}: Altering user {user} {with_clause}."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/postgresql/service/users.py:230
+#: trove/guestagent/datastore/experimental/postgresql/service/users.py:263
 msgid "{guest_id}: Changing username for {old} to {new}."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/postgresql/service/users.py:245
+#: trove/guestagent/datastore/experimental/postgresql/service/users.py:278
 msgid "{guest_id}: Regranting permissions from {old} to {new}."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/pxc/manager.py:74
-#: trove/guestagent/datastore/experimental/vertica/manager.py:201
+#: trove/guestagent/datastore/experimental/pxc/manager.py:63
+#: trove/guestagent/datastore/experimental/vertica/manager.py:107
 msgid "Cluster installation failed."
 msgstr ""
 
 #: trove/guestagent/datastore/experimental/pxc/service.py:67
-#: trove/guestagent/datastore/mysql_common/service.py:661
+#: trove/guestagent/datastore/mysql_common/service.py:660
 msgid "Generating admin password."
 msgstr ""
 
 #: trove/guestagent/datastore/experimental/pxc/service.py:103
-#: trove/guestagent/datastore/mysql_common/service.py:849
+#: trove/guestagent/datastore/mysql_common/service.py:848
 msgid "Granting Replication Slave privilege."
 msgstr ""
 
@@ -2040,20 +2023,20 @@ msgstr ""
 msgid "Installing cluster configuration."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/redis/manager.py:98
+#: trove/guestagent/datastore/experimental/redis/manager.py:77
 msgid "Writing redis configuration."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/redis/manager.py:338
+#: trove/guestagent/datastore/experimental/redis/manager.py:221
 msgid "Retrieving latest repl offset."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/redis/manager.py:342
+#: trove/guestagent/datastore/experimental/redis/manager.py:225
 #, python-format
 msgid "Waiting on repl offset '%s'."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/redis/manager.py:352
+#: trove/guestagent/datastore/experimental/redis/manager.py:235
 #, python-format
 msgid "Timeout occurred waiting for Redis repl offset to change to '%s'."
 msgstr ""
@@ -2062,109 +2045,81 @@ msgstr ""
 msgid "Error getting Redis status."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/redis/service.py:125
+#: trove/guestagent/datastore/experimental/redis/service.py:117
 msgid "Preparing Guest as Redis Server."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/redis/service.py:127
+#: trove/guestagent/datastore/experimental/redis/service.py:119
 msgid "Installing Redis."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/redis/service.py:129
+#: trove/guestagent/datastore/experimental/redis/service.py:121
 msgid "Redis installed completely."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/redis/service.py:148
-msgid "Enabling Redis on boot."
-msgstr ""
-
-#: trove/guestagent/datastore/experimental/redis/service.py:155
-msgid "Disabling Redis on boot."
-msgstr ""
-
-#: trove/guestagent/datastore/experimental/redis/service.py:162
-msgid "Stopping redis."
-msgstr ""
-
-#: trove/guestagent/datastore/experimental/redis/service.py:170
-msgid "Could not stop Redis."
-msgstr ""
-
-#: trove/guestagent/datastore/experimental/redis/service.py:232
+#: trove/guestagent/datastore/experimental/redis/service.py:192
 msgid "Starting redis with conf changes."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/redis/service.py:253
-msgid "Starting redis."
-msgstr ""
-
-#: trove/guestagent/datastore/experimental/redis/service.py:259
-msgid "Start up of redis failed."
-msgstr ""
-
-#: trove/guestagent/datastore/experimental/redis/service.py:266
-msgid "Error killing stalled redis start command."
-msgstr ""
-
-#: trove/guestagent/datastore/experimental/redis/service.py:396
+#: trove/guestagent/datastore/experimental/redis/service.py:336
 #, python-format
 msgid "Error joining node to cluster at %s."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/redis/service.py:409
+#: trove/guestagent/datastore/experimental/redis/service.py:349
 #, python-format
 msgid "Error executing addslots: %s"
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/redis/service.py:413
+#: trove/guestagent/datastore/experimental/redis/service.py:353
 #, python-format
 msgid "Error adding slots %(first_slot)s-%(last_slot)s to cluster."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/redis/service.py:424
+#: trove/guestagent/datastore/experimental/redis/service.py:364
 msgid "Error getting node info."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/redis/service.py:431
+#: trove/guestagent/datastore/experimental/redis/service.py:371
 msgid "Unable to determine node details"
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/redis/service.py:446
+#: trove/guestagent/datastore/experimental/redis/service.py:386
 msgid "Error validating node to for removal."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/redis/service.py:455
+#: trove/guestagent/datastore/experimental/redis/service.py:395
 msgid "Error removing node from cluster."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/redis/service.py:494
+#: trove/guestagent/datastore/experimental/redis/service.py:434
 #, python-format
 msgid "Could not set configuration property '%(name)s' to '%(value)s'."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/redis/service.py:511
+#: trove/guestagent/datastore/experimental/redis/service.py:451
 #, python-format
 msgid "Redis command '%(cmd_name)s %(cmd_args)s' failed."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/redis/service.py:525
+#: trove/guestagent/datastore/experimental/redis/service.py:465
 #, python-format
 msgid "Output from Redis command: %s"
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/redis/service.py:526
+#: trove/guestagent/datastore/experimental/redis/service.py:466
 #, python-format
 msgid "Field %(field)s not found (Section: '%(sec)s')."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/redis/service.py:534
+#: trove/guestagent/datastore/experimental/redis/service.py:474
 #, python-format
 msgid ""
 "Timeout occurred waiting for Redis field '%(field)s' to change to "
 "'%(val)s'."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/vertica/manager.py:64
+#: trove/guestagent/datastore/experimental/vertica/manager.py:63
 #, python-format
 msgid "Bad cluster configuration: instance type given as %s."
 msgstr ""
@@ -2178,7 +2133,7 @@ msgid "Service Status is SHUTDOWN."
 msgstr ""
 
 #: trove/guestagent/datastore/experimental/vertica/service.py:56
-#: trove/guestagent/datastore/mysql_common/service.py:152
+#: trove/guestagent/datastore/mysql_common/service.py:151
 msgid "Failed to get database status."
 msgstr ""
 
@@ -2282,167 +2237,172 @@ msgstr ""
 msgid "Cannot export configuration."
 msgstr ""
 
-#: trove/guestagent/datastore/mysql_common/service.py:96
+#: trove/guestagent/datastore/mysql_common/service.py:95
 msgid "/root/.mysql_secret does not exist."
 msgstr ""
 
-#: trove/guestagent/datastore/mysql_common/service.py:106
+#: trove/guestagent/datastore/mysql_common/service.py:105
 msgid "Cannot change mysql password."
 msgstr ""
 
-#: trove/guestagent/datastore/mysql_common/service.py:149
+#: trove/guestagent/datastore/mysql_common/service.py:148
 msgid "MySQL Service Status is RUNNING."
 msgstr ""
 
-#: trove/guestagent/datastore/mysql_common/service.py:159
+#: trove/guestagent/datastore/mysql_common/service.py:158
 #, python-format
 msgid "MySQL Service Status %(pid)s is BLOCKED."
 msgstr ""
 
-#: trove/guestagent/datastore/mysql_common/service.py:163
+#: trove/guestagent/datastore/mysql_common/service.py:162
 msgid "Process execution failed."
 msgstr ""
 
-#: trove/guestagent/datastore/mysql_common/service.py:168
+#: trove/guestagent/datastore/mysql_common/service.py:167
 msgid "MySQL Service Status is CRASHED."
 msgstr ""
 
-#: trove/guestagent/datastore/mysql_common/service.py:171
+#: trove/guestagent/datastore/mysql_common/service.py:170
 msgid "MySQL Service Status is SHUTDOWN."
 msgstr ""
 
-#: trove/guestagent/datastore/mysql_common/service.py:365
+#: trove/guestagent/datastore/mysql_common/service.py:364
 msgid "Error Getting user information"
 msgstr ""
 
-#: trove/guestagent/datastore/mysql_common/service.py:366
+#: trove/guestagent/datastore/mysql_common/service.py:365
 #, python-format
 msgid "Username %(user)s is not valid: %(reason)s"
 msgstr ""
 
-#: trove/guestagent/datastore/mysql_common/service.py:398
+#: trove/guestagent/datastore/mysql_common/service.py:397
 msgid "Error granting access"
 msgstr ""
 
-#: trove/guestagent/datastore/mysql_common/service.py:399
+#: trove/guestagent/datastore/mysql_common/service.py:398
 #, python-format
 msgid "Grant access to %s is not allowed"
 msgstr ""
 
-#: trove/guestagent/datastore/mysql_common/service.py:648
+#: trove/guestagent/datastore/mysql_common/service.py:647
 msgid "Preparing Guest as MySQL Server."
 msgstr ""
 
-#: trove/guestagent/datastore/mysql_common/service.py:657
+#: trove/guestagent/datastore/mysql_common/service.py:656
 msgid "Finished installing MySQL server."
 msgstr ""
 
-#: trove/guestagent/datastore/mysql_common/service.py:694
+#: trove/guestagent/datastore/mysql_common/service.py:693
 msgid "Preserving root access from restore."
 msgstr ""
 
-#: trove/guestagent/datastore/mysql_common/service.py:725
+#: trove/guestagent/datastore/mysql_common/service.py:724
 msgid "Error enabling MySQL start on boot."
 msgstr ""
 
-#: trove/guestagent/datastore/mysql_common/service.py:735
+#: trove/guestagent/datastore/mysql_common/service.py:734
 msgid "Error disabling MySQL start on boot."
 msgstr ""
 
-#: trove/guestagent/datastore/mysql_common/service.py:739
+#: trove/guestagent/datastore/mysql_common/service.py:738
 msgid "Stopping MySQL."
 msgstr ""
 
-#: trove/guestagent/datastore/mysql_common/service.py:747
+#: trove/guestagent/datastore/mysql_common/service.py:746
 msgid "Error stopping MySQL."
 msgstr ""
 
-#: trove/guestagent/datastore/mysql_common/service.py:752
+#: trove/guestagent/datastore/mysql_common/service.py:751
 msgid "Could not stop MySQL."
 msgstr ""
 
-#: trove/guestagent/datastore/mysql_common/service.py:794
+#: trove/guestagent/datastore/mysql_common/service.py:793
 #, python-format
 msgid "Unable to set %(key)s with value %(value)s."
 msgstr ""
 
-#: trove/guestagent/datastore/mysql_common/service.py:809
+#: trove/guestagent/datastore/mysql_common/service.py:808
 msgid "Wiping ib_logfiles."
 msgstr ""
 
-#: trove/guestagent/datastore/mysql_common/service.py:827
+#: trove/guestagent/datastore/mysql_common/service.py:826
 msgid "Removing replication configuration file."
 msgstr ""
 
-#: trove/guestagent/datastore/mysql_common/service.py:881
+#: trove/guestagent/datastore/mysql_common/service.py:880
 msgid "Starting slave replication."
 msgstr ""
 
-#: trove/guestagent/datastore/mysql_common/service.py:888
+#: trove/guestagent/datastore/mysql_common/service.py:887
 msgid "Stopping slave replication."
 msgstr ""
 
-#: trove/guestagent/datastore/mysql_common/service.py:902
+#: trove/guestagent/datastore/mysql_common/service.py:901
 msgid "Stopping replication master."
 msgstr ""
 
-#: trove/guestagent/datastore/mysql_common/service.py:917
+#: trove/guestagent/datastore/mysql_common/service.py:916
 #, python-format
 msgid "Replication is now %s."
 msgstr ""
 
-#: trove/guestagent/datastore/mysql_common/service.py:920
+#: trove/guestagent/datastore/mysql_common/service.py:919
 #, python-format
 msgid "Replication is not %(status)s after %(max)d seconds."
 msgstr ""
 
-#: trove/guestagent/datastore/mysql_common/service.py:924
+#: trove/guestagent/datastore/mysql_common/service.py:923
 msgid "Starting MySQL."
 msgstr ""
 
-#: trove/guestagent/datastore/mysql_common/service.py:951
+#: trove/guestagent/datastore/mysql_common/service.py:950
 msgid "Start up of MySQL failed."
 msgstr ""
 
-#: trove/guestagent/datastore/mysql_common/service.py:957
+#: trove/guestagent/datastore/mysql_common/service.py:956
 msgid "Error killing stalled MySQL start command."
 msgstr ""
 
-#: trove/guestagent/datastore/mysql_common/service.py:963
+#: trove/guestagent/datastore/mysql_common/service.py:962
 msgid "Starting MySQL with conf changes."
 msgstr ""
 
-#: trove/guestagent/datastore/mysql_common/service.py:967
+#: trove/guestagent/datastore/mysql_common/service.py:966
 #, python-format
 msgid "Cannot execute start_db_with_conf_changes because MySQL state == %s."
 msgstr ""
 
-#: trove/guestagent/datastore/mysql_common/service.py:981
-#: trove/guestagent/datastore/mysql_common/service.py:1018
+#: trove/guestagent/datastore/mysql_common/service.py:969
+#: trove/guestagent/datastore/mysql_common/service.py:975
+msgid "Resetting configuration."
+msgstr ""
+
+#: trove/guestagent/datastore/mysql_common/service.py:980
+#: trove/guestagent/datastore/mysql_common/service.py:1017
 msgid "Retrieving latest txn id."
 msgstr ""
 
-#: trove/guestagent/datastore/mysql_common/service.py:1022
+#: trove/guestagent/datastore/mysql_common/service.py:1021
 #, python-format
 msgid "Waiting on txn '%s'."
 msgstr ""
 
-#: trove/guestagent/db/models.py:62 trove/guestagent/db/models.py:490
+#: trove/guestagent/db/models.py:63 trove/guestagent/db/models.py:491
 #, python-format
 msgid "Bad dictionary. Keys: %(keys)s. Required: %(reqs)s"
 msgstr ""
 
-#: trove/guestagent/db/models.py:95
+#: trove/guestagent/db/models.py:96
 #, python-format
 msgid "Schema name '%(name)s' is too long. Max length = %(max_length)d."
 msgstr ""
 
-#: trove/guestagent/db/models.py:100
+#: trove/guestagent/db/models.py:101
 #, python-format
 msgid "'%s' is not a valid schema name."
 msgstr ""
 
-#: trove/guestagent/db/models.py:138
+#: trove/guestagent/db/models.py:139
 #, python-format
 msgid "Bad args. name: %(name)s, deserializing %(deser)s."
 msgstr ""
@@ -2462,65 +2422,65 @@ msgstr ""
 msgid "'%s' not a valid character set."
 msgstr ""
 
-#: trove/guestagent/db/models.py:468
+#: trove/guestagent/db/models.py:469
 #, python-format
 msgid "'%s' is not a valid database name."
 msgstr ""
 
-#: trove/guestagent/db/models.py:470
+#: trove/guestagent/db/models.py:471
 #, python-format
 msgid "Database name '%s' is too long. Max length = 64."
 msgstr ""
 
-#: trove/guestagent/db/models.py:516 trove/guestagent/db/models.py:812
+#: trove/guestagent/db/models.py:517 trove/guestagent/db/models.py:813
 #, python-format
 msgid "'%s' is not a valid password."
 msgstr ""
 
-#: trove/guestagent/db/models.py:538 trove/guestagent/db/models.py:835
+#: trove/guestagent/db/models.py:539 trove/guestagent/db/models.py:836
 #, python-format
 msgid "'%s' is not a valid hostname."
 msgstr ""
 
-#: trove/guestagent/db/models.py:556
+#: trove/guestagent/db/models.py:557
 #, python-format
 msgid "User name '%(name)s' is too long. Max length = %(max_length)d."
 msgstr ""
 
-#: trove/guestagent/db/models.py:561 trove/guestagent/db/models.py:798
+#: trove/guestagent/db/models.py:562 trove/guestagent/db/models.py:799
 #, python-format
 msgid "'%s' is not a valid user name."
 msgstr ""
 
-#: trove/guestagent/db/models.py:617
+#: trove/guestagent/db/models.py:618
 #, python-format
 msgid "Bad args. name: %(name)s, password %(pass)s, deserializing %(deser)s."
 msgstr ""
 
-#: trove/guestagent/db/models.py:657
+#: trove/guestagent/db/models.py:658
 #, python-format
 msgid "MongoDB user's name missing %s."
 msgstr ""
 
-#: trove/guestagent/db/models.py:662
+#: trove/guestagent/db/models.py:663
 msgid "MongoDB user missing database."
 msgstr ""
 
-#: trove/guestagent/db/models.py:666
+#: trove/guestagent/db/models.py:667
 msgid "MongoDB user missing username."
 msgstr ""
 
-#: trove/guestagent/db/models.py:710
+#: trove/guestagent/db/models.py:711
 #, python-format
 msgid "MongoDB user name \"%s\" not in <database>.<username> format."
 msgstr ""
 
-#: trove/guestagent/db/models.py:730
+#: trove/guestagent/db/models.py:731
 #, python-format
 msgid "Role %s is invalid."
 msgstr ""
 
-#: trove/guestagent/db/models.py:800
+#: trove/guestagent/db/models.py:801
 #, python-format
 msgid "User name '%s' is too long. Max length = 16."
 msgstr ""
@@ -2558,7 +2518,8 @@ msgid "Exception enabling guest as replica"
 msgstr ""
 
 #: trove/guestagent/strategies/replication/mysql_binlog.py:40
-msgid "Unable to determine binlog position (from file %(binlog_file))."
+#, python-format
+msgid "Unable to determine binlog position (from file %(binlog_file)s)."
 msgstr ""
 
 #: trove/guestagent/strategies/replication/mysql_binlog.py:67
@@ -2584,7 +2545,6 @@ msgid "Root password reset successfully."
 msgstr ""
 
 #: trove/guestagent/strategies/restore/mysql_impl.py:207
-#: trove/guestagent/strategies/restore/experimental/redis_impl.py:47
 #, python-format
 msgid "Cleaning out restore location: %s."
 msgstr ""
@@ -2599,82 +2559,63 @@ msgstr ""
 msgid "Restoring parent: %(parent_location)s checksum: %(parent_checksum)s."
 msgstr ""
 
-#: trove/guestagent/strategies/storage/swift.py:132
+#: trove/guestagent/strategies/restore/experimental/redis_impl.py:47
 #, python-format
-msgid ""
-"Error saving data segment to swift. ETAG: %(tag)s Segment MD5: "
-"%(checksum)s."
-msgstr ""
-
-#: trove/guestagent/strategies/storage/swift.py:163
-#, python-format
-msgid "Error saving data to swift. Manifest ETAG: %(tag)s Swift MD5: %(checksum)s"
-msgstr ""
-
-#: trove/guestagent/strategies/storage/swift.py:180
-#, python-format
-msgid ""
-"Original checksum: %(original)s does not match the current checksum: "
-"%(current)s"
-msgstr ""
-
-#: trove/guestagent/strategies/storage/swift.py:237
-#, python-format
-msgid "Writing metadata: %s"
+msgid "Removing old persistence file: %s."
 msgstr ""
 
 #: trove/instance/models.py:571
 msgid "Detach replicas before deleting replica source."
 msgstr ""
 
-#: trove/instance/models.py:746
+#: trove/instance/models.py:749
 #, python-format
 msgid "Cannot create a replica of a replica %(id)s."
 msgstr ""
 
-#: trove/instance/models.py:762
+#: trove/instance/models.py:765
 #, python-format
 msgid "Cannot create a replica of %(id)s as that instance could not be found."
 msgstr ""
 
-#: trove/instance/models.py:767
+#: trove/instance/models.py:770
 #, python-format
 msgid ""
 "Replica count only valid when creating replicas. Cannot create %(count)d "
 "instances."
 msgstr ""
 
-#: trove/instance/models.py:880
+#: trove/instance/models.py:884
 #, python-format
 msgid "The new flavor id must be different than the current flavor id of '%s'."
 msgstr ""
 
-#: trove/instance/models.py:912
+#: trove/instance/models.py:916
 #, python-format
 msgid "The new volume 'size' must be larger than the current volume size of '%s'."
 msgstr ""
 
-#: trove/instance/models.py:920
+#: trove/instance/models.py:924
 #, python-format
 msgid "Instance %s has no volume."
 msgstr ""
 
-#: trove/instance/models.py:955 trove/instance/models.py:963
+#: trove/instance/models.py:959 trove/instance/models.py:967
 #, python-format
 msgid "Instance %s is not a replica."
 msgstr ""
 
-#: trove/instance/models.py:980
+#: trove/instance/models.py:984
 #, python-format
 msgid "Instance %s is not a replica source."
 msgstr ""
 
-#: trove/instance/models.py:986
+#: trove/instance/models.py:990
 #, python-format
 msgid "Replica Source %s cannot be ejected as it has a current heartbeat"
 msgstr ""
 
-#: trove/instance/models.py:1023
+#: trove/instance/models.py:1027
 #, python-format
 msgid ""
 "Instance %(instance_id)s is not currently available for an action to be "
@@ -2728,12 +2669,12 @@ msgid ""
 "switched: %(replicas)s"
 msgstr ""
 
-#: trove/taskmanager/manager.py:291
+#: trove/taskmanager/manager.py:292
 #, python-format
 msgid "Could not create replica %(num)d of %(count)d."
 msgstr ""
 
-#: trove/taskmanager/manager.py:319
+#: trove/taskmanager/manager.py:320
 msgid "Cannot create multiple non-replica instances."
 msgstr ""
 
@@ -2773,251 +2714,251 @@ msgstr ""
 msgid "Error creating security group for instance: %s"
 msgstr ""
 
-#: trove/taskmanager/models.py:422
+#: trove/taskmanager/models.py:424
 #, python-format
 msgid "Error creating DNS entry for instance: %s"
 msgstr ""
 
-#: trove/taskmanager/models.py:433
+#: trove/taskmanager/models.py:435
 #, python-format
 msgid "Error attaching instance %s as replica."
 msgstr ""
 
-#: trove/taskmanager/models.py:474
+#: trove/taskmanager/models.py:476
 #, python-format
 msgid "Unable to create replication snapshot record for instance: %s"
 msgstr ""
 
-#: trove/taskmanager/models.py:508
+#: trove/taskmanager/models.py:510
 #, python-format
 msgid ""
 "Error creating replication snapshot from instance %(source)s for new "
 "replica %(replica)s."
 msgstr ""
 
-#: trove/taskmanager/models.py:524
+#: trove/taskmanager/models.py:526
 #, python-format
 msgid ""
 "An error occurred while deleting a bad replication snapshot from instance"
 " %(source)s."
 msgstr ""
 
-#: trove/taskmanager/models.py:545
+#: trove/taskmanager/models.py:547
 #, python-format
 msgid "Service status: %(status)s"
 msgstr ""
 
-#: trove/taskmanager/models.py:548
+#: trove/taskmanager/models.py:550
 #, python-format
 msgid "Service error description: %(desc)s"
 msgstr ""
 
-#: trove/taskmanager/models.py:556
+#: trove/taskmanager/models.py:558
 #, python-format
 msgid "Trove instance status: %(action)s"
 msgstr ""
 
-#: trove/taskmanager/models.py:559
+#: trove/taskmanager/models.py:561
 #, python-format
 msgid "Trove instance status description: %(text)s"
 msgstr ""
 
-#: trove/taskmanager/models.py:581
+#: trove/taskmanager/models.py:583
 #, python-format
 msgid "Service not active, status: %s"
 msgstr ""
 
-#: trove/taskmanager/models.py:587
+#: trove/taskmanager/models.py:589
 #, python-format
 msgid "Server not active, status: %s"
 msgstr ""
 
-#: trove/taskmanager/models.py:622
+#: trove/taskmanager/models.py:624
 #, python-format
 msgid "Error creating server and volume for instance %s"
 msgstr ""
 
-#: trove/taskmanager/models.py:727
+#: trove/taskmanager/models.py:731
 #, python-format
 msgid "Error occurred during Heat stack creation for instance %s."
 msgstr ""
 
-#: trove/taskmanager/models.py:758
+#: trove/taskmanager/models.py:763
 #, python-format
 msgid "Failed to create server for instance %s"
 msgstr ""
 
-#: trove/taskmanager/models.py:776
+#: trove/taskmanager/models.py:782
 #, python-format
 msgid "Failed to create volume for instance %s"
 msgstr ""
 
-#: trove/taskmanager/models.py:909
+#: trove/taskmanager/models.py:916
 #, python-format
 msgid ""
 "Failed to create DNS entry for instance %(instance)s. Server status was "
 "%(status)s)."
 msgstr ""
 
-#: trove/taskmanager/models.py:920
+#: trove/taskmanager/models.py:927
 msgid "Creating dns entry..."
 msgstr ""
 
-#: trove/taskmanager/models.py:943
+#: trove/taskmanager/models.py:950
 #, python-format
 msgid ""
 "Failed to create security group rules for instance %(instance_id)s: "
 "Invalid port format - FromPort = %(from)s, ToPort = %(to)s"
 msgstr ""
 
-#: trove/taskmanager/models.py:1001
+#: trove/taskmanager/models.py:1008
 #, python-format
 msgid "Error stopping the datastore before attempting to delete instance id %s."
 msgstr ""
 
-#: trove/taskmanager/models.py:1012
+#: trove/taskmanager/models.py:1019
 #, python-format
 msgid "Error during delete compute server %s"
 msgstr ""
 
-#: trove/taskmanager/models.py:1021
+#: trove/taskmanager/models.py:1028
 #, python-format
 msgid "Error during dns entry of instance %(id)s: %(ex)s"
 msgstr ""
 
-#: trove/taskmanager/models.py:1030
+#: trove/taskmanager/models.py:1037
 #, python-format
 msgid ""
 "Server %(server_id)s entered ERROR status when deleting instance "
 "%(instance_id)s!"
 msgstr ""
 
-#: trove/taskmanager/models.py:1041
+#: trove/taskmanager/models.py:1048
 #, python-format
 msgid ""
 "Failed to delete instance %(instance_id)s: Timeout deleting compute "
 "server %(server_id)s"
 msgstr ""
 
-#: trove/taskmanager/models.py:1051
+#: trove/taskmanager/models.py:1058
 #, python-format
 msgid "Deleting volume %(v)s for instance: %(i)s."
 msgstr ""
 
-#: trove/taskmanager/models.py:1055
+#: trove/taskmanager/models.py:1062
 #, python-format
 msgid "Error deleting volume of instance %(id)s."
 msgstr ""
 
-#: trove/taskmanager/models.py:1070
+#: trove/taskmanager/models.py:1077
 #, python-format
 msgid ""
 "Resizing volume for instance %(instance_id)s from %(old_size)s GB to "
 "%(new_size)s GB."
 msgstr ""
 
-#: trove/taskmanager/models.py:1076
+#: trove/taskmanager/models.py:1083
 #, python-format
 msgid "Resized volume for instance %s successfully."
 msgstr ""
 
-#: trove/taskmanager/models.py:1079
+#: trove/taskmanager/models.py:1086
 #, python-format
 msgid ""
 "Resizing instance %(instance_id)s from flavor %(old_flavor)s to "
 "%(new_flavor)s."
 msgstr ""
 
-#: trove/taskmanager/models.py:1085
+#: trove/taskmanager/models.py:1092
 #, python-format
 msgid "Resized instance %s successfully."
 msgstr ""
 
-#: trove/taskmanager/models.py:1088
+#: trove/taskmanager/models.py:1095
 #, python-format
 msgid "Initiating migration to host %s."
 msgstr ""
 
-#: trove/taskmanager/models.py:1093
+#: trove/taskmanager/models.py:1100
 #, python-format
 msgid "Initiating backup for instance %s."
 msgstr ""
 
-#: trove/taskmanager/models.py:1112
+#: trove/taskmanager/models.py:1119
 #, python-format
 msgid "Failed to get replication snapshot from %s."
 msgstr ""
 
-#: trove/taskmanager/models.py:1126
+#: trove/taskmanager/models.py:1133
 #, python-format
 msgid "Failed to detach replica %s."
 msgstr ""
 
-#: trove/taskmanager/models.py:1139
+#: trove/taskmanager/models.py:1146
 #, python-format
 msgid "Failed to attach replica %s."
 msgstr ""
 
-#: trove/taskmanager/models.py:1218
+#: trove/taskmanager/models.py:1225
 #, python-format
 msgid "Cannot reboot instance. DB status is %s."
 msgstr ""
 
-#: trove/taskmanager/models.py:1224
+#: trove/taskmanager/models.py:1231
 #, python-format
 msgid "Rebooting instance %s."
 msgstr ""
 
-#: trove/taskmanager/models.py:1241
+#: trove/taskmanager/models.py:1248
 #, python-format
 msgid "Rebooted instance %s successfully."
 msgstr ""
 
-#: trove/taskmanager/models.py:1243
+#: trove/taskmanager/models.py:1250
 #, python-format
 msgid "Failed to reboot instance %(id)s: %(e)s"
 msgstr ""
 
-#: trove/taskmanager/models.py:1250
+#: trove/taskmanager/models.py:1257
 #, python-format
 msgid "Initiating datastore restart on instance %s."
 msgstr ""
 
-#: trove/taskmanager/models.py:1254
+#: trove/taskmanager/models.py:1261
 #, python-format
 msgid "Failed to initiate datastore restart on instance %s."
 msgstr ""
 
-#: trove/taskmanager/models.py:1324
+#: trove/taskmanager/models.py:1331
 #, python-format
 msgid "Deleting backup %s."
 msgstr ""
 
-#: trove/taskmanager/models.py:1337
+#: trove/taskmanager/models.py:1344
 #, python-format
 msgid "Error occurred when deleting from swift. Details: %s"
 msgstr ""
 
-#: trove/taskmanager/models.py:1345
+#: trove/taskmanager/models.py:1352
 #, python-format
 msgid "Deleted backup %s successfully."
 msgstr ""
 
-#: trove/taskmanager/models.py:1365
+#: trove/taskmanager/models.py:1372
 #, python-format
 msgid ""
 "%(func)s encountered an error when attempting to resize the volume for "
 "instance %(id)s. Setting service status to failed."
 msgstr ""
 
-#: trove/taskmanager/models.py:1375
+#: trove/taskmanager/models.py:1382
 #, python-format
 msgid ""
 "%(func)s encountered an error when attempting to resize the volume for "
 "instance %(id)s. Trying to recover by restarting the guest."
 msgstr ""
 
-#: trove/taskmanager/models.py:1383
+#: trove/taskmanager/models.py:1390
 #, python-format
 msgid ""
 "%(func)s encountered an error when attempting to resize the volume for "
@@ -3025,7 +2966,7 @@ msgid ""
 "restarting the guest."
 msgstr ""
 
-#: trove/taskmanager/models.py:1392
+#: trove/taskmanager/models.py:1399
 #, python-format
 msgid ""
 "%(func)s encountered an error when attempting to resize the volume for "
@@ -3033,53 +2974,53 @@ msgid ""
 "and then restarting the guest."
 msgstr ""
 
-#: trove/taskmanager/models.py:1500
+#: trove/taskmanager/models.py:1507
 #, python-format
 msgid "Failed to get volume %(vol_id)s"
 msgstr ""
 
-#: trove/taskmanager/models.py:1514
+#: trove/taskmanager/models.py:1521
 #, python-format
 msgid "Timeout trying to extend the volume %(vol_id)s for instance %(id)s"
 msgstr ""
 
-#: trove/taskmanager/models.py:1527
+#: trove/taskmanager/models.py:1534
 #, python-format
 msgid ""
 "Error encountered trying to verify extend for the volume %(vol_id)s for "
 "instance %(id)s"
 msgstr ""
 
-#: trove/taskmanager/models.py:1574
+#: trove/taskmanager/models.py:1581
 #, python-format
 msgid ""
 "Failed to resize instance %(id)s volume for server %(server_id)s. The "
 "instance must be in state %(state)s not %(inst_state)s."
 msgstr ""
 
-#: trove/taskmanager/models.py:1697
+#: trove/taskmanager/models.py:1704
 msgid "Exception during nova action."
 msgstr ""
 
-#: trove/taskmanager/models.py:1699
+#: trove/taskmanager/models.py:1706
 #, python-format
 msgid "Reverting action for instance %s"
 msgstr ""
 
-#: trove/taskmanager/models.py:1705
+#: trove/taskmanager/models.py:1712
 msgid "Restarting datastore."
 msgstr ""
 
-#: trove/taskmanager/models.py:1708
+#: trove/taskmanager/models.py:1715
 msgid "Cannot restart datastore because Nova server status is not ACTIVE"
 msgstr ""
 
-#: trove/taskmanager/models.py:1711
+#: trove/taskmanager/models.py:1718
 #, python-format
 msgid "Error resizing instance %s."
 msgstr ""
 
-#: trove/taskmanager/models.py:1773
+#: trove/taskmanager/models.py:1780
 msgid "Error sending reset_configuration call."
 msgstr ""