diff --git a/trove/locale/ko_KR/LC_MESSAGES/trove-log-warning.po b/trove/locale/ko_KR/LC_MESSAGES/trove-log-warning.po
index da377623f4..86745a9edb 100644
--- a/trove/locale/ko_KR/LC_MESSAGES/trove-log-warning.po
+++ b/trove/locale/ko_KR/LC_MESSAGES/trove-log-warning.po
@@ -8,11 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trove\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-05-04 06:04+0000\n"
+"POT-Creation-Date: 2015-07-15 06:09+0000\n"
 "PO-Revision-Date: 2015-03-12 10:28+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: Korean (Korea) (http://www.transifex.com/projects/p/trove/"
-"language/ko_KR/)\n"
+"Language-Team: Korean (Korea) (http://www.transifex.com/p/trove/language/"
+"ko_KR/)\n"
 "Language: ko_KR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/trove/locale/trove.pot b/trove/locale/trove.pot
index cd23e34d03..7520e2f45e 100644
--- a/trove/locale/trove.pot
+++ b/trove/locale/trove.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: trove 2015.2.0.dev30\n"
+"Project-Id-Version: trove 4.0.0.0b2.dev26\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-05-04 06:04+0000\n"
+"POT-Creation-Date: 2015-07-15 06:09+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"
@@ -48,7 +48,7 @@ msgid "Setting task to NONE on cluster %s"
 msgstr ""
 
 #: trove/cluster/models.py:193
-#: trove/common/strategies/cluster/experimental/mongodb/api.py:176
+#: trove/common/strategies/cluster/experimental/mongodb/api.py:181
 #, python-format
 msgid ""
 "This action cannot be performed on the cluster while the current cluster "
@@ -58,8 +58,8 @@ msgstr ""
 #: trove/cluster/service.py:56 trove/cluster/service.py:80
 #: trove/cluster/service.py:91 trove/cluster/service.py:105
 #: trove/cluster/service.py:116 trove/cluster/service.py:131
-#: trove/extensions/account/service.py:35
-#: trove/extensions/account/service.py:46
+#: trove/extensions/account/service.py:34
+#: trove/extensions/account/service.py:45
 #: trove/extensions/mgmt/clusters/service.py:43
 #: trove/extensions/mgmt/clusters/service.py:59
 #: trove/extensions/mgmt/clusters/service.py:72
@@ -74,13 +74,13 @@ msgstr ""
 #: trove/extensions/mgmt/quota/service.py:33
 #: trove/extensions/mgmt/upgrade/service.py:35
 #: trove/extensions/mgmt/volume/service.py:33
-#: trove/extensions/mysql/service.py:46 trove/extensions/mysql/service.py:54
-#: trove/extensions/mysql/service.py:76 trove/extensions/mysql/service.py:87
-#: trove/extensions/mysql/service.py:100 trove/extensions/mysql/service.py:123
-#: trove/extensions/mysql/service.py:140 trove/extensions/mysql/service.py:162
-#: trove/extensions/mysql/service.py:210 trove/extensions/mysql/service.py:226
-#: trove/extensions/mysql/service.py:241 trove/extensions/mysql/service.py:264
-#: trove/extensions/mysql/service.py:275 trove/extensions/mysql/service.py:285
+#: trove/extensions/mysql/service.py:45 trove/extensions/mysql/service.py:53
+#: trove/extensions/mysql/service.py:75 trove/extensions/mysql/service.py:86
+#: trove/extensions/mysql/service.py:99 trove/extensions/mysql/service.py:122
+#: trove/extensions/mysql/service.py:139 trove/extensions/mysql/service.py:161
+#: trove/extensions/mysql/service.py:209 trove/extensions/mysql/service.py:225
+#: trove/extensions/mysql/service.py:240 trove/extensions/mysql/service.py:263
+#: trove/extensions/mysql/service.py:274 trove/extensions/mysql/service.py:284
 #, python-format
 msgid ""
 "req : '%s'\n"
@@ -101,14 +101,13 @@ msgid ""
 msgstr ""
 
 #: trove/cluster/service.py:59 trove/extensions/mgmt/clusters/service.py:74
-#: trove/extensions/mgmt/clusters/service.py:94
 #: trove/extensions/mgmt/configuration/service.py:80
 #: trove/extensions/mgmt/configuration/service.py:107
 #: trove/extensions/mgmt/host/instance/service.py:34
 #: trove/extensions/mgmt/host/instance/service.py:52
 #: trove/extensions/mgmt/instances/service.py:97
 #: trove/extensions/mgmt/instances/service.py:120
-#: trove/extensions/mgmt/quota/service.py:43 trove/instance/service.py:75
+#: trove/extensions/mgmt/quota/service.py:43 trove/instance/service.py:74
 msgid "Invalid request body."
 msgstr ""
 
@@ -131,20 +130,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: trove/cluster/service.py:132 trove/extensions/mysql/service.py:88
-#: trove/extensions/mysql/service.py:276
+#: trove/cluster/service.py:132 trove/extensions/mysql/service.py:87
+#: trove/extensions/mysql/service.py:275
 #, python-format
 msgid ""
 "body : '%s'\n"
 "\n"
 msgstr ""
 
-#: trove/cmd/manage.py:180
+#: trove/cmd/manage.py:181
 #, python-format
 msgid "Possible wrong number of arguments supplied %s"
 msgstr ""
 
-#: trove/cmd/manage.py:183
+#: trove/cmd/manage.py:184
 msgid "Command failed, please check log for more info."
 msgstr ""
 
@@ -153,49 +152,49 @@ msgstr ""
 msgid "Authorized tenant '%(tenant_id)s' request: %(request)s"
 msgstr ""
 
-#: trove/common/auth.py:69
+#: trove/common/auth.py:70
 #, python-format
-msgid "User with tenant id %s cannot access this resource"
+msgid "User with tenant id %s cannot access this resource."
 msgstr ""
 
-#: trove/common/base_exception.py:102 trove/openstack/common/exception.py:104
+#: trove/common/base_exception.py:101 trove/openstack/common/exception.py:104
 msgid "Uncaught exception"
 msgstr ""
 
-#: trove/common/base_wsgi.py:112 trove/openstack/common/wsgi.py:114
+#: trove/common/base_wsgi.py:111 trove/openstack/common/wsgi.py:114
 #, python-format
 msgid "Could not bind to %(host)s:%(port)s after trying for 30 seconds"
 msgstr ""
 
-#: trove/common/base_wsgi.py:373 trove/openstack/common/wsgi.py:375
+#: trove/common/base_wsgi.py:372 trove/openstack/common/wsgi.py:375
 msgid "Unsupported Content-Type"
 msgstr ""
 
-#: trove/common/base_wsgi.py:376 trove/openstack/common/wsgi.py:378
+#: trove/common/base_wsgi.py:375 trove/openstack/common/wsgi.py:378
 msgid "Malformed request body"
 msgstr ""
 
-#: trove/common/base_wsgi.py:662 trove/openstack/common/wsgi.py:664
+#: trove/common/base_wsgi.py:661 trove/openstack/common/wsgi.py:664
 msgid "Empty body provided in request"
 msgstr ""
 
-#: trove/common/base_wsgi.py:668 trove/openstack/common/wsgi.py:670
+#: trove/common/base_wsgi.py:667 trove/openstack/common/wsgi.py:670
 msgid "Unrecognized Content-Type provided in request"
 msgstr ""
 
-#: trove/common/base_wsgi.py:672 trove/openstack/common/wsgi.py:674
+#: trove/common/base_wsgi.py:671 trove/openstack/common/wsgi.py:674
 msgid "No Content-Type provided in request"
 msgstr ""
 
-#: trove/common/base_wsgi.py:678 trove/openstack/common/wsgi.py:680
+#: trove/common/base_wsgi.py:677 trove/openstack/common/wsgi.py:680
 msgid "Unable to deserialize body as provided Content-Type"
 msgstr ""
 
-#: trove/common/base_wsgi.py:728 trove/openstack/common/wsgi.py:730
+#: trove/common/base_wsgi.py:727 trove/openstack/common/wsgi.py:730
 msgid "cannot understand JSON"
 msgstr ""
 
-#: trove/common/base_wsgi.py:752 trove/openstack/common/wsgi.py:754
+#: trove/common/base_wsgi.py:751 trove/openstack/common/wsgi.py:754
 msgid "cannot understand XML"
 msgstr ""
 
@@ -693,7 +692,7 @@ msgstr ""
 msgid "Missing heat template for %(s_datastore_manager)s."
 msgstr ""
 
-#: trove/common/utils.py:226
+#: trove/common/utils.py:227
 #, python-format
 msgid ""
 "Command '%(cmd)s' failed. %(description)s Exit code: %(exit_code)s\n"
@@ -701,11 +700,11 @@ msgid ""
 "stdout: %(stdout)s"
 msgstr ""
 
-#: trove/common/utils.py:235
+#: trove/common/utils.py:236
 msgid "Got a timeout but not the one expected."
 msgstr ""
 
-#: trove/common/utils.py:238
+#: trove/common/utils.py:239
 #, python-format
 msgid ""
 "Time out after waiting %(time)s seconds when running proc: %(args)s "
@@ -720,11 +719,11 @@ msgstr ""
 msgid "Unserializable result detected."
 msgstr ""
 
-#: trove/common/wsgi.py:529
+#: trove/common/wsgi.py:530
 msgid "Invalid service catalog json."
 msgstr ""
 
-#: trove/common/wsgi.py:574
+#: trove/common/wsgi.py:575
 #, python-format
 msgid "Caught error: %s."
 msgstr ""
@@ -790,81 +789,81 @@ msgstr ""
 msgid "Configuration group with ID %s could not be found."
 msgstr ""
 
-#: trove/configuration/service.py:90
+#: trove/configuration/service.py:91
 #, python-format
 msgid ""
 "Creating configuration group on tenant %(tenant_id)s with name: "
 "%(cfg_name)s"
 msgstr ""
 
-#: trove/configuration/service.py:122
+#: trove/configuration/service.py:123
 #, python-format
 msgid "Deleting configuration group %(cfg_id)s on tenant: %(tenant_id)s"
 msgstr ""
 
-#: trove/configuration/service.py:138
+#: trove/configuration/service.py:139
 #, python-format
 msgid "Updating configuration group %(cfg_id)s for tenant id %(tenant_id)s"
 msgstr ""
 
-#: trove/configuration/service.py:198
+#: trove/configuration/service.py:199
 msgid "Validating configuration values"
 msgstr ""
 
-#: trove/configuration/service.py:209
+#: trove/configuration/service.py:210
 #, python-format
 msgid ""
 "Configuration groups are not supported for this datastore: %(name)s "
 "%(version)s"
 msgstr ""
 
-#: trove/configuration/service.py:220
+#: trove/configuration/service.py:221
 #, python-format
 msgid ""
 "The configuration parameter %(key)s is not supported for this datastore: "
 "%(name)s %(version)s."
 msgstr ""
 
-#: trove/configuration/service.py:233
+#: trove/configuration/service.py:234
 #, python-format
 msgid ""
 "The value provided for the configuration parameter %(key)s is not of type"
 " %(type)s."
 msgstr ""
 
-#: trove/configuration/service.py:242
+#: trove/configuration/service.py:244
 msgid ""
 "Invalid or unsupported min value defined in the configuration-parameters "
 "configuration file. Expected integer."
 msgstr ""
 
-#: trove/configuration/service.py:248
+#: trove/configuration/service.py:250
 #, python-format
 msgid ""
 "The value for the configuration parameter %(key)s is less than the "
 "minimum allowed: %(min)s"
 msgstr ""
 
-#: trove/configuration/service.py:256
+#: trove/configuration/service.py:260
 msgid ""
 "Invalid or unsupported max value defined in the configuration-parameters "
 "configuration file. Expected integer."
 msgstr ""
 
-#: trove/configuration/service.py:262
+#: trove/configuration/service.py:266
 #, python-format
 msgid ""
 "The value for the configuration parameter %(key)s is greater than the "
 "maximum allowed: %(max)s"
 msgstr ""
 
-#: trove/configuration/service.py:276
+#: trove/configuration/service.py:281
 msgid ""
 "Invalid or unsupported type defined in the configuration-parameters "
 "configuration file."
 msgstr ""
 
-#: trove/configuration/service.py:286
+#: trove/configuration/service.py:291
 #, python-format
 msgid "%s is not a supported configuration parameter."
 msgstr ""
@@ -896,7 +895,7 @@ msgstr ""
 msgid "Tenant %(s_tenant)s cannot access %(s_name)s"
 msgstr ""
 
-#: trove/db/sqlalchemy/session.py:81
+#: trove/db/sqlalchemy/session.py:82
 #, python-format
 msgid "Creating SQLAlchemy engine with args: %s"
 msgstr ""
@@ -906,25 +905,18 @@ msgstr ""
 msgid "%s Not Found"
 msgstr ""
 
-#: trove/extensions/account/service.py:36
+#: trove/extensions/account/service.py:35
 #, python-format
 msgid "Showing account information for '%(account)s' to '%(tenant)s'"
 msgstr ""
 
-#: trove/extensions/account/service.py:47
+#: trove/extensions/account/service.py:46
 #, python-format
 msgid "Showing all accounts with instances for '%s'"
 msgstr ""
 
-#: trove/extensions/mgmt/clusters/service.py:84
-#: trove/extensions/mgmt/host/instance/service.py:42
-#: trove/extensions/mgmt/instances/service.py:110
-msgid "Only one action can be specified per request."
-msgstr ""
-
-#: trove/extensions/mgmt/clusters/service.py:88
-#, python-format
-msgid "Invalid cluster action: %s."
+#: trove/extensions/mgmt/clusters/service.py:81
+msgid "Invalid cluster action requested."
 msgstr ""
 
 #: trove/extensions/mgmt/configuration/service.py:61
@@ -981,6 +973,11 @@ msgstr ""
 msgid "Showing a host for tenant '%s'"
 msgstr ""
 
+#: trove/extensions/mgmt/host/instance/service.py:42
+#: trove/extensions/mgmt/instances/service.py:110
+msgid "Only one action can be specified per request."
+msgstr ""
+
 #: trove/extensions/mgmt/host/instance/service.py:46
 #, python-format
 msgid "Invalid host action: %s"
@@ -1035,78 +1032,78 @@ msgstr ""
 msgid "Indexing storage info for tenant '%s'"
 msgstr ""
 
-#: trove/extensions/mysql/service.py:45
+#: trove/extensions/mysql/service.py:44
 #, python-format
 msgid "Getting root enabled for instance '%s'"
 msgstr ""
 
-#: trove/extensions/mysql/service.py:53
+#: trove/extensions/mysql/service.py:52
 #, python-format
 msgid "Enabling root for instance '%s'"
 msgstr ""
 
-#: trove/extensions/mysql/service.py:75
+#: trove/extensions/mysql/service.py:74
 #, python-format
 msgid "Listing users for instance '%s'"
 msgstr ""
 
-#: trove/extensions/mysql/service.py:86
+#: trove/extensions/mysql/service.py:85
 #, python-format
 msgid "Creating users for instance '%s'"
 msgstr ""
 
-#: trove/extensions/mysql/service.py:99
+#: trove/extensions/mysql/service.py:98
 #, python-format
 msgid "Deleting user for instance '%s'"
 msgstr ""
 
-#: trove/extensions/mysql/service.py:122
+#: trove/extensions/mysql/service.py:121
 #, python-format
 msgid "Showing a user for instance '%s'"
 msgstr ""
 
-#: trove/extensions/mysql/service.py:139
+#: trove/extensions/mysql/service.py:138
 #, python-format
 msgid "Updating user attributes for instance '%s'"
 msgstr ""
 
-#: trove/extensions/mysql/service.py:161
+#: trove/extensions/mysql/service.py:160
 #, python-format
 msgid "Updating user passwords for instance '%s'"
 msgstr ""
 
-#: trove/extensions/mysql/service.py:209
+#: trove/extensions/mysql/service.py:208
 #, python-format
 msgid "Showing user access for instance '%s'"
 msgstr ""
 
-#: trove/extensions/mysql/service.py:216 trove/extensions/mysql/service.py:231
-#: trove/extensions/mysql/service.py:246
+#: trove/extensions/mysql/service.py:215 trove/extensions/mysql/service.py:230
+#: trove/extensions/mysql/service.py:245
 #, python-format
 msgid "No such user: %(user)s "
 msgstr ""
 
-#: trove/extensions/mysql/service.py:225
+#: trove/extensions/mysql/service.py:224
 #, python-format
 msgid "Granting user access for instance '%s'"
 msgstr ""
 
-#: trove/extensions/mysql/service.py:240
+#: trove/extensions/mysql/service.py:239
 #, python-format
 msgid "Revoking user access for instance '%s'"
 msgstr ""
 
-#: trove/extensions/mysql/service.py:263
+#: trove/extensions/mysql/service.py:262
 #, python-format
 msgid "Listing schemas for instance '%s'"
 msgstr ""
 
-#: trove/extensions/mysql/service.py:274
+#: trove/extensions/mysql/service.py:273
 #, python-format
 msgid "Creating schema for instance '%s'"
 msgstr ""
 
-#: trove/extensions/mysql/service.py:284
+#: trove/extensions/mysql/service.py:283
 #, python-format
 msgid "Deleting schema for instance '%s'"
 msgstr ""
@@ -1116,7 +1113,7 @@ msgstr ""
 msgid "Failed to create remote security group."
 msgstr ""
 
-#: trove/extensions/security_group/models.py:76 trove/taskmanager/models.py:727
+#: trove/extensions/security_group/models.py:76 trove/taskmanager/models.py:726
 #, python-format
 msgid "Security Group for %s"
 msgstr ""
@@ -1155,124 +1152,147 @@ msgstr ""
 msgid "Error finding instance %s"
 msgstr ""
 
-#: trove/guestagent/pkg.py:121
+#: trove/guestagent/pkg.py:122
 #, python-format
 msgid "Error removing conflict %(package)s"
 msgstr ""
 
-#: trove/guestagent/pkg.py:220
+#: trove/guestagent/pkg.py:221
 #, python-format
 msgid "Unexpected output from rpm command. (%(output)s)"
 msgstr ""
 
-#: trove/guestagent/pkg.py:243
+#: trove/guestagent/pkg.py:244
 msgid "Error fixing dpkg"
 msgstr ""
 
-#: trove/guestagent/pkg.py:355
+#: trove/guestagent/pkg.py:356
 msgid "Error updating the apt sources"
 msgstr ""
 
-#: trove/guestagent/volume.py:65
+#: trove/guestagent/volume.py:66
 msgid "Error getting device status"
 msgstr ""
 
-#: trove/guestagent/volume.py:66
+#: trove/guestagent/volume.py:67
 #, python-format
 msgid "InvalidDevicePath(path=%s)"
 msgstr ""
 
-#: trove/guestagent/volume.py:82
+#: trove/guestagent/volume.py:83
 msgid "Device path at {0} did not seem to be {1}."
 msgstr ""
 
-#: trove/guestagent/volume.py:86
+#: trove/guestagent/volume.py:87
 msgid "Volume was not formatted."
 msgstr ""
 
-#: trove/guestagent/volume.py:129
+#: trove/guestagent/volume.py:130
 msgid "Error resizing file system."
 msgstr ""
 
-#: trove/guestagent/volume.py:130
+#: trove/guestagent/volume.py:131
 #, python-format
 msgid "Error resizing the filesystem: %s"
 msgstr ""
 
-#: trove/guestagent/volume.py:143
+#: trove/guestagent/volume.py:144
 #, python-format
 msgid "Device %(device)s is already mounted in %(mount_point)s. Unmounting now."
 msgstr ""
 
-#: trove/guestagent/volume.py:156
+#: trove/guestagent/volume.py:157
 msgid "Error retrieving mount points"
 msgstr ""
 
-#: trove/guestagent/volume.py:157
+#: trove/guestagent/volume.py:158
 #, python-format
 msgid "Could not obtain a list of mount points for device: %s"
 msgstr ""
 
-#: trove/guestagent/volume.py:168
+#: trove/guestagent/volume.py:169
 #, python-format
 msgid "Error setting readhead size to %(size)s for device %(device)s."
 msgstr ""
 
-#: trove/guestagent/volume.py:171
+#: trove/guestagent/volume.py:172
 #, python-format
 msgid "Error setting readhead size: %s."
 msgstr ""
 
-#: trove/guestagent/backup/backupagent.py:120
+#: trove/guestagent/backup/backupagent.py:117
 #, python-format
 msgid "Error saving backup: %(backup_id)s."
 msgstr ""
 
-#: trove/guestagent/backup/backupagent.py:124
+#: trove/guestagent/backup/backupagent.py:121
 #, python-format
 msgid "Completed backup %(backup_id)s."
 msgstr ""
 
-#: trove/guestagent/backup/backupagent.py:181
+#: trove/guestagent/backup/backupagent.py:178
 #, python-format
 msgid "Error restoring backup %(id)s."
 msgstr ""
 
-#: trove/guestagent/common/operating_system.py:231
+#: trove/guestagent/common/configuration.py:111
+msgid "The maximum number of attached Configuration Groups cannot be negative."
+msgstr ""
+
+#: trove/guestagent/common/configuration.py:224
+#, python-format
+msgid "This instance cannot have more than '%d' Configuration Groups attached."
+msgstr ""
+
+#: trove/guestagent/common/configuration.py:250
+msgid "This instance does not have a Configuration Group attached."
+msgstr ""
+
+#: trove/guestagent/common/operating_system.py:56
+#, python-format
+msgid "File does not exist: %s"
+msgstr ""
+
+#: trove/guestagent/common/operating_system.py:86
+#, python-format
+msgid "Invalid path: %s"
+msgstr ""
+
+#: trove/guestagent/common/operating_system.py:310
 msgid "Cannot create a blank directory."
 msgstr ""
 
-#: trove/guestagent/common/operating_system.py:260
+#: trove/guestagent/common/operating_system.py:339
 msgid "Cannot change ownership of a blank file or directory."
 msgstr ""
 
-#: trove/guestagent/common/operating_system.py:263
+#: trove/guestagent/common/operating_system.py:342
 msgid "Please specify owner or group, or both."
 msgstr ""
 
-#: trove/guestagent/common/operating_system.py:319
+#: trove/guestagent/common/operating_system.py:398
 msgid "Cannot change mode of a blank file."
 msgstr ""
 
-#: trove/guestagent/common/operating_system.py:349
+#: trove/guestagent/common/operating_system.py:428
 msgid "No file mode specified."
 msgstr ""
 
-#: trove/guestagent/common/operating_system.py:373
+#: trove/guestagent/common/operating_system.py:452
 msgid "Cannot remove a blank file."
 msgstr ""
 
-#: trove/guestagent/common/operating_system.py:397
-#: trove/guestagent/common/operating_system.py:434
+#: trove/guestagent/common/operating_system.py:476
+#: trove/guestagent/common/operating_system.py:513
 msgid "Missing source path."
 msgstr ""
 
-#: trove/guestagent/common/operating_system.py:399
-#: trove/guestagent/common/operating_system.py:436
+#: trove/guestagent/common/operating_system.py:478
+#: trove/guestagent/common/operating_system.py:515
 msgid "Missing destination path."
 msgstr ""
 
-#: trove/guestagent/common/operating_system.py:467
+#: trove/guestagent/common/operating_system.py:554
 #, python-format
 msgid "Got unknown keyword args: %r"
 msgstr ""
@@ -1282,72 +1302,72 @@ msgstr ""
 msgid "Updating database status to %s."
 msgstr ""
 
-#: trove/guestagent/datastore/service.py:129
+#: trove/guestagent/datastore/service.py:128
 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:153
+#: trove/guestagent/datastore/service.py:152
 msgid "Timeout while waiting for database status to change."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/cassandra/manager.py:69
+#: trove/guestagent/datastore/experimental/cassandra/manager.py:70
 msgid "Setting status of instance to BUILDING."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/cassandra/manager.py:104
+#: trove/guestagent/datastore/experimental/cassandra/manager.py:105
 msgid "Completed setup of Cassandra database instance."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/cassandra/service.py:49
+#: trove/guestagent/datastore/experimental/cassandra/service.py:51
 msgid "Preparing Guest as a Cassandra Server"
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/cassandra/service.py:69
+#: trove/guestagent/datastore/experimental/cassandra/service.py:71
 msgid "Error while initiating storage structure."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/cassandra/service.py:77
+#: trove/guestagent/datastore/experimental/cassandra/service.py:79
 msgid "Error starting Cassandra"
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/cassandra/service.py:89
+#: trove/guestagent/datastore/experimental/cassandra/service.py:91
 msgid "Error killing Cassandra start command."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/cassandra/service.py:91
+#: trove/guestagent/datastore/experimental/cassandra/service.py:93
 msgid "Could not start Cassandra"
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/cassandra/service.py:103
 #: trove/guestagent/datastore/experimental/cassandra/service.py:105
+#: trove/guestagent/datastore/experimental/cassandra/service.py:107
 msgid "Could not stop Cassandra."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/cassandra/service.py:110
+#: trove/guestagent/datastore/experimental/cassandra/service.py:112
 msgid "Restarting Cassandra server."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/cassandra/service.py:151
+#: trove/guestagent/datastore/experimental/cassandra/service.py:153
 #, python-format
 msgid "Exception generating Cassandra configuration %s."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/cassandra/service.py:158
+#: trove/guestagent/datastore/experimental/cassandra/service.py:160
 msgid "Wrote new Cassandra configuration."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/cassandra/service.py:207
+#: trove/guestagent/datastore/experimental/cassandra/service.py:209
 msgid "Starting Cassandra with configuration changes."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/cassandra/service.py:211
+#: trove/guestagent/datastore/experimental/cassandra/service.py:213
 #, python-format
 msgid "Cannot execute start_db_with_conf_changes because Cassandra state == %s."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/cassandra/service.py:237
+#: trove/guestagent/datastore/experimental/cassandra/service.py:239
 msgid "Error getting Cassandra status"
 msgstr ""
 
@@ -1369,83 +1389,83 @@ msgstr ""
 msgid "Restored database successfully"
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/couchbase/service.py:61
+#: trove/guestagent/datastore/experimental/couchbase/service.py:62
 msgid "Preparing Guest as Couchbase Server."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/couchbase/service.py:70
+#: trove/guestagent/datastore/experimental/couchbase/service.py:71
 msgid "Couchbase Server change data dir path."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/couchbase/service.py:89
+#: trove/guestagent/datastore/experimental/couchbase/service.py:90
 msgid "Couchbase Server initial setup finished."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/couchbase/service.py:91
+#: trove/guestagent/datastore/experimental/couchbase/service.py:92
 msgid "Error performing initial Couchbase setup."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/couchbase/service.py:117
+#: trove/guestagent/datastore/experimental/couchbase/service.py:118
 msgid "Enabling Couchbase Server on boot."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/couchbase/service.py:124
+#: trove/guestagent/datastore/experimental/couchbase/service.py:125
 msgid "Command to enable Couchbase Server on boot not found."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/couchbase/service.py:157
-#: trove/guestagent/datastore/experimental/couchbase/service.py:159
+#: trove/guestagent/datastore/experimental/couchbase/service.py:158
+#: trove/guestagent/datastore/experimental/couchbase/service.py:160
 msgid "Could not stop Couchbase Server."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/couchbase/service.py:162
+#: trove/guestagent/datastore/experimental/couchbase/service.py:163
 msgid "Restarting Couchbase Server."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/couchbase/service.py:174
+#: trove/guestagent/datastore/experimental/couchbase/service.py:175
 msgid "Starting Couchbase Server."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/couchbase/service.py:190
+#: trove/guestagent/datastore/experimental/couchbase/service.py:191
 msgid "Start up of Couchbase Server failed."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/couchbase/service.py:194
+#: trove/guestagent/datastore/experimental/couchbase/service.py:195
 msgid "Error killing Couchbase start command."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/couchbase/service.py:202
+#: trove/guestagent/datastore/experimental/couchbase/service.py:203
 msgid "Starting Couchbase with configuration changes."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/couchbase/service.py:203
-#: trove/guestagent/datastore/experimental/mongodb/service.py:142
+#: trove/guestagent/datastore/experimental/couchbase/service.py:204
+#: trove/guestagent/datastore/experimental/mongodb/service.py:143
 #, python-format
 msgid ""
 "Configuration contents:\n"
 " %s."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/couchbase/service.py:205
+#: trove/guestagent/datastore/experimental/couchbase/service.py:206
 #, python-format
 msgid "Cannot start Couchbase with configuration changes. Couchbase state == %s."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/couchbase/service.py:235
+#: trove/guestagent/datastore/experimental/couchbase/service.py:236
 msgid "Error getting the Couchbase status."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/couchbase/service.py:241
+#: trove/guestagent/datastore/experimental/couchbase/service.py:242
 msgid "Error getting the root password from the native Couchbase config file."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/couchbase/service.py:255
+#: trove/guestagent/datastore/experimental/couchbase/service.py:256
 msgid ""
 "Error getting Couchbase status using the password parsed from the native "
 "Couchbase config file."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/couchbase/service.py:324
+#: trove/guestagent/datastore/experimental/couchbase/service.py:325
 #, python-format
 msgid "An error occurred in saving password (%(errno)s). %(strerror)s."
 msgstr ""
@@ -1585,120 +1605,137 @@ msgstr ""
 msgid "Unable to delete user: %s."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/mongodb/manager.py:102
-#: trove/guestagent/datastore/experimental/vertica/manager.py:76
+#: trove/guestagent/datastore/experimental/mongodb/manager.py:107
+#: trove/guestagent/datastore/experimental/vertica/manager.py:77
 #, python-format
 msgid "Bad cluster configuration; instance type given as %s."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/mongodb/manager.py:108
+#: trove/guestagent/datastore/experimental/mongodb/manager.py:113
 msgid "Completed setup of MongoDB database instance."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/mongodb/service.py:47
+#: trove/guestagent/datastore/experimental/mongodb/manager.py:225
+#: trove/guestagent/datastore/mysql/manager.py:106
+#, python-format
+msgid "Restoring database from backup %s."
+msgstr ""
+
+#: trove/guestagent/datastore/experimental/mongodb/manager.py:229
+#: trove/guestagent/datastore/mysql/manager.py:110
+#, python-format
+msgid "Error performing restore from backup %s."
+msgstr ""
+
+#: trove/guestagent/datastore/experimental/mongodb/manager.py:233
+#: trove/guestagent/datastore/mysql/manager.py:114
+msgid "Restored database successfully."
+msgstr ""
+
+#: trove/guestagent/datastore/experimental/mongodb/service.py:48
 msgid "Preparing Guest as MongoDB."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/mongodb/service.py:51
+#: trove/guestagent/datastore/experimental/mongodb/service.py:52
 msgid "Finished installing MongoDB server."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/mongodb/service.py:62
+#: trove/guestagent/datastore/experimental/mongodb/service.py:63
 msgid "Enabling MongoDB on boot."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/mongodb/service.py:68
-#: trove/guestagent/datastore/experimental/mongodb/service.py:90
+#: trove/guestagent/datastore/experimental/mongodb/service.py:69
+#: trove/guestagent/datastore/experimental/mongodb/service.py:91
 msgid "MongoDB service is not discovered."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/mongodb/service.py:71
+#: trove/guestagent/datastore/experimental/mongodb/service.py:72
 msgid "Disabling MongoDB on boot."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/mongodb/service.py:80
+#: trove/guestagent/datastore/experimental/mongodb/service.py:81
 msgid "Stopping MongoDB."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/mongodb/service.py:95
+#: trove/guestagent/datastore/experimental/mongodb/service.py:96
 msgid "Could not stop MongoDB."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/mongodb/service.py:97
+#: trove/guestagent/datastore/experimental/mongodb/service.py:98
 msgid "Could not stop MongoDB"
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/mongodb/service.py:100
+#: trove/guestagent/datastore/experimental/mongodb/service.py:101
 msgid "Restarting MongoDB."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/mongodb/service.py:109
+#: trove/guestagent/datastore/experimental/mongodb/service.py:110
 msgid "Starting MongoDB."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/mongodb/service.py:125
+#: trove/guestagent/datastore/experimental/mongodb/service.py:126
 msgid "Start up of MongoDB failed."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/mongodb/service.py:135
+#: trove/guestagent/datastore/experimental/mongodb/service.py:136
 msgid "Error killing MongoDB start command."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/mongodb/service.py:141
+#: trove/guestagent/datastore/experimental/mongodb/service.py:142
 msgid "Starting MongoDB with configuration changes."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/mongodb/service.py:144
+#: trove/guestagent/datastore/experimental/mongodb/service.py:145
 #, python-format
 msgid "Cannot start MongoDB with configuration changes. MongoDB state == %s."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/mongodb/service.py:152
+#: trove/guestagent/datastore/experimental/mongodb/service.py:153
 #: trove/guestagent/datastore/experimental/redis/service.py:249
 #: trove/guestagent/datastore/mysql/service.py:973
 #: trove/guestagent/datastore/mysql/service.py:979
 msgid "Resetting configuration."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/mongodb/service.py:156
+#: trove/guestagent/datastore/experimental/mongodb/service.py:157
 msgid "Updating configuration contents."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/mongodb/service.py:172
+#: trove/guestagent/datastore/experimental/mongodb/service.py:173
 msgid "Updating MongoDB config."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/mongodb/service.py:174
-#: trove/guestagent/datastore/experimental/mongodb/service.py:240
+#: trove/guestagent/datastore/experimental/mongodb/service.py:175
+#: trove/guestagent/datastore/experimental/mongodb/service.py:241
 #, python-format
 msgid "Writing %s."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/mongodb/service.py:179
-#: trove/guestagent/datastore/experimental/mongodb/service.py:245
+#: trove/guestagent/datastore/experimental/mongodb/service.py:180
+#: trove/guestagent/datastore/experimental/mongodb/service.py:246
 #, python-format
 msgid "Moving %(a)s to %(b)s."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/mongodb/service.py:194
+#: trove/guestagent/datastore/experimental/mongodb/service.py:195
 #, python-format
 msgid "Config file %s not found."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/mongodb/service.py:216
+#: trove/guestagent/datastore/experimental/mongodb/service.py:217
 msgid "Error clearing storage."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/mongodb/service.py:233
+#: trove/guestagent/datastore/experimental/mongodb/service.py:234
 msgid "Rewriting configuration."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/mongodb/service.py:373
+#: trove/guestagent/datastore/experimental/mongodb/service.py:381
 #, python-format
 msgid "Process execution %s."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/mongodb/service.py:376
+#: trove/guestagent/datastore/experimental/mongodb/service.py:384
 #, python-format
 msgid "OS Error %s."
 msgstr ""
@@ -1707,23 +1744,23 @@ msgstr ""
 msgid "{guest_id}: Granting user ({user}) access to database ({database})."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/postgresql/service/access.py:60
+#: trove/guestagent/datastore/experimental/postgresql/service/access.py:59
 msgid "{guest_id}: Revoking user ({user}) access to database({database})."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/postgresql/service/config.py:105
+#: trove/guestagent/datastore/experimental/postgresql/service/config.py:106
 msgid "{guest_id}: Going into restart mode for config file changes."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/postgresql/service/config.py:115
+#: trove/guestagent/datastore/experimental/postgresql/service/config.py:116
 msgid "{guest_id}: Ending restart mode for config file changes."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/postgresql/service/database.py:44
+#: trove/guestagent/datastore/experimental/postgresql/service/database.py:45
 msgid "{guest_id}: Creating database {name}."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/postgresql/service/database.py:66
+#: trove/guestagent/datastore/experimental/postgresql/service/database.py:67
 msgid "{guest_id}: Dropping database {name}."
 msgstr ""
 
@@ -1751,23 +1788,23 @@ msgstr ""
 msgid "{guest_id}: Restarting database engine."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/postgresql/service/users.py:52
+#: trove/guestagent/datastore/experimental/postgresql/service/users.py:53
 msgid "{guest_id}: Creating user {name} with password {password}."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/postgresql/service/users.py:135
+#: trove/guestagent/datastore/experimental/postgresql/service/users.py:136
 msgid "{guest_id}: Dropping user {name}."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/postgresql/service/users.py:189
+#: trove/guestagent/datastore/experimental/postgresql/service/users.py:190
 msgid "{guest_id}: Changing password for {user} to {password}."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/postgresql/service/users.py:228
+#: trove/guestagent/datastore/experimental/postgresql/service/users.py:229
 msgid "{guest_id}: Changing username for {old} to {new}."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/postgresql/service/users.py:243
+#: trove/guestagent/datastore/experimental/postgresql/service/users.py:244
 msgid "{guest_id}: Regranting permissions from {old} to {new}."
 msgstr ""
 
@@ -1855,127 +1892,115 @@ msgstr ""
 msgid "Error killing stalled redis start command."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/vertica/manager.py:54
+#: trove/guestagent/datastore/experimental/vertica/manager.py:55
 msgid "Setting instance status to BUILDING."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/vertica/manager.py:79
+#: trove/guestagent/datastore/experimental/vertica/manager.py:80
 msgid "Completed setup of Vertica database instance."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/vertica/manager.py:81
+#: trove/guestagent/datastore/experimental/vertica/manager.py:82
 msgid "Cannot prepare Vertica database instance."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/vertica/manager.py:221
+#: trove/guestagent/datastore/experimental/vertica/manager.py:222
 msgid "Cluster installation failed."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/vertica/service.py:47
+#: trove/guestagent/datastore/experimental/vertica/service.py:48
 msgid "Service Status is RUNNING."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/vertica/service.py:50
+#: trove/guestagent/datastore/experimental/vertica/service.py:51
 msgid "Service Status is SHUTDOWN."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/vertica/service.py:53
+#: trove/guestagent/datastore/experimental/vertica/service.py:54
 #: trove/guestagent/datastore/mysql/service.py:175
 msgid "Failed to get database status."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/vertica/service.py:73
+#: trove/guestagent/datastore/experimental/vertica/service.py:74
 msgid "Failed to enable db on boot."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/vertica/service.py:83
+#: trove/guestagent/datastore/experimental/vertica/service.py:84
 msgid "Failed to disable db on boot."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/vertica/service.py:88
+#: trove/guestagent/datastore/experimental/vertica/service.py:89
 msgid "Stopping Vertica."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/vertica/service.py:106
+#: trove/guestagent/datastore/experimental/vertica/service.py:107
 msgid "Could not stop Vertica."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/vertica/service.py:113
+#: trove/guestagent/datastore/experimental/vertica/service.py:114
 msgid "Failed to stop database."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/vertica/service.py:118
+#: trove/guestagent/datastore/experimental/vertica/service.py:119
 msgid "Starting Vertica."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/vertica/service.py:141
+#: trove/guestagent/datastore/experimental/vertica/service.py:142
 msgid "Starting Vertica with configuration changes."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/vertica/service.py:155
+#: trove/guestagent/datastore/experimental/vertica/service.py:156
 msgid "Creating database on Vertica host."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/vertica/service.py:164
+#: trove/guestagent/datastore/experimental/vertica/service.py:165
+#: trove/guestagent/datastore/experimental/vertica/service.py:166
 msgid "Vertica database create failed."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/vertica/service.py:165
+#: trove/guestagent/datastore/experimental/vertica/service.py:167
 msgid "Vertica database create completed."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/vertica/service.py:169
+#: trove/guestagent/datastore/experimental/vertica/service.py:171
 msgid "Installing Vertica Server."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/vertica/service.py:176
+#: trove/guestagent/datastore/experimental/vertica/service.py:178
+#: trove/guestagent/datastore/experimental/vertica/service.py:179
 msgid "install_vertica failed."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/vertica/service.py:178
+#: trove/guestagent/datastore/experimental/vertica/service.py:181
 msgid "install_vertica completed."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/vertica/service.py:216
+#: trove/guestagent/datastore/experimental/vertica/service.py:219
 #, python-format
 msgid "Failed to read config %s."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/vertica/service.py:225
+#: trove/guestagent/datastore/experimental/vertica/service.py:228
 msgid "Preparing Guest as Vertica Server."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/vertica/service.py:247
+#: trove/guestagent/datastore/experimental/vertica/service.py:250
 msgid "Failed to prepare for install_vertica."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/vertica/service.py:266
+#: trove/guestagent/datastore/experimental/vertica/service.py:269
 msgid "Cannot read public key."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/vertica/service.py:293
+#: trove/guestagent/datastore/experimental/vertica/service.py:296
 msgid "Cannot install public keys."
 msgstr ""
 
-#: trove/guestagent/datastore/experimental/vertica/service.py:306
+#: trove/guestagent/datastore/experimental/vertica/service.py:309
 msgid "Cannot export configuration."
 msgstr ""
 
-#: trove/guestagent/datastore/mysql/manager.py:105
-#, python-format
-msgid "Restoring database from backup %s."
-msgstr ""
-
-#: trove/guestagent/datastore/mysql/manager.py:109
-#, python-format
-msgid "Error performing restore from backup %s."
-msgstr ""
-
-#: trove/guestagent/datastore/mysql/manager.py:113
-msgid "Restored database successfully."
-msgstr ""
-
-#: trove/guestagent/datastore/mysql/manager.py:165
+#: trove/guestagent/datastore/mysql/manager.py:166
 msgid "Completed setup of MySQL database instance."
 msgstr ""
 
@@ -2218,11 +2243,18 @@ msgstr ""
 msgid "All buckets are memcached.  Skipping backup."
 msgstr ""
 
-#: trove/guestagent/strategies/replication/mysql_base.py:78
+#: trove/guestagent/strategies/backup/experimental/mongo_impl.py:58
+#, python-format
+msgid ""
+"Need more free space to run mongodump, estimated %(est_dump_size)s and "
+"found %(avail)s bytes free "
+msgstr ""
+
+#: trove/guestagent/strategies/replication/mysql_base.py:79
 msgid "Replication user retry count exceeded"
 msgstr ""
 
-#: trove/guestagent/strategies/replication/mysql_base.py:129
+#: trove/guestagent/strategies/replication/mysql_base.py:130
 msgid "Exception enabling guest as replica"
 msgstr ""
 
@@ -2230,39 +2262,39 @@ msgstr ""
 msgid "Unable to determine binlog position (from file %(binlog_file))."
 msgstr ""
 
-#: trove/guestagent/strategies/replication/mysql_binlog.py:64
+#: trove/guestagent/strategies/replication/mysql_binlog.py:65
 #, python-format
 msgid "Setting read permissions on %s"
 msgstr ""
 
-#: trove/guestagent/strategies/replication/mysql_binlog.py:66
+#: trove/guestagent/strategies/replication/mysql_binlog.py:67
 #, python-format
 msgid "Reading log position from %s"
 msgstr ""
 
-#: trove/guestagent/strategies/restore/mysql_impl.py:90
+#: trove/guestagent/strategies/restore/mysql_impl.py:91
 msgid "Starting MySQL"
 msgstr ""
 
-#: trove/guestagent/strategies/restore/mysql_impl.py:92
+#: trove/guestagent/strategies/restore/mysql_impl.py:93
 msgid "Got a timeout launching mysqld_safe"
 msgstr ""
 
-#: trove/guestagent/strategies/restore/mysql_impl.py:108
+#: trove/guestagent/strategies/restore/mysql_impl.py:109
 msgid "Root password reset successfully."
 msgstr ""
 
-#: trove/guestagent/strategies/restore/mysql_impl.py:206
+#: trove/guestagent/strategies/restore/mysql_impl.py:207
 #, python-format
 msgid "Cleaning out restore location: %s."
 msgstr ""
 
-#: trove/guestagent/strategies/restore/mysql_impl.py:215
-#: trove/guestagent/strategies/restore/mysql_impl.py:272
+#: trove/guestagent/strategies/restore/mysql_impl.py:216
+#: trove/guestagent/strategies/restore/mysql_impl.py:273
 msgid "Innobackupex prepare finished successfully."
 msgstr ""
 
-#: trove/guestagent/strategies/restore/mysql_impl.py:287
+#: trove/guestagent/strategies/restore/mysql_impl.py:288
 #, python-format
 msgid "Restoring parent: %(parent_location)s checksum: %(parent_checksum)s."
 msgstr ""
@@ -2291,58 +2323,58 @@ msgstr ""
 msgid "Writing metadata: %s"
 msgstr ""
 
-#: trove/instance/models.py:568
+#: trove/instance/models.py:570
 msgid "Detach replicas before deleting replica source."
 msgstr ""
 
-#: trove/instance/models.py:730
+#: trove/instance/models.py:732
 #, python-format
 msgid "Cannot create a replica of a replica %(id)s."
 msgstr ""
 
-#: trove/instance/models.py:746
+#: trove/instance/models.py:748
 #, python-format
 msgid "Cannot create a replica of %(id)s as that instance could not be found."
 msgstr ""
 
-#: trove/instance/models.py:751
+#: trove/instance/models.py:753
 #, python-format
 msgid ""
 "Replica count only valid when creating replicas. Cannot create %(count)d "
 "instances."
 msgstr ""
 
-#: trove/instance/models.py:867
+#: trove/instance/models.py:866
 #, python-format
 msgid "The new flavor id must be different than the current flavor id of '%s'."
 msgstr ""
 
-#: trove/instance/models.py:899
+#: trove/instance/models.py:898
 #, python-format
 msgid "The new volume 'size' must be larger than the current volume size of '%s'."
 msgstr ""
 
-#: trove/instance/models.py:907
+#: trove/instance/models.py:906
 #, python-format
 msgid "Instance %s has no volume."
 msgstr ""
 
-#: trove/instance/models.py:942 trove/instance/models.py:950
+#: trove/instance/models.py:941 trove/instance/models.py:949
 #, python-format
 msgid "Instance %s is not a replica."
 msgstr ""
 
-#: trove/instance/models.py:967
+#: trove/instance/models.py:966
 #, python-format
 msgid "Instance %s is not a replica source."
 msgstr ""
 
-#: trove/instance/models.py:973
+#: trove/instance/models.py:972
 #, python-format
 msgid "Replica Source %s cannot be ejected as it has a current heartbeat"
 msgstr ""
 
-#: trove/instance/models.py:1010
+#: trove/instance/models.py:1009
 #, python-format
 msgid ""
 "Instance %(instance_id)s is not currently available for an action to be "
@@ -2440,7 +2472,7 @@ msgid ""
 "key_file option value in your configuration file"
 msgstr ""
 
-#: trove/openstack/common/sslutils.py:100
+#: trove/openstack/common/sslutils.py:104
 #, python-format
 msgid "Invalid SSL version : %s"
 msgstr ""
@@ -2508,354 +2540,354 @@ msgstr ""
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: trove/taskmanager/manager.py:114
+#: trove/taskmanager/manager.py:113
 #, python-format
 msgid ""
 "promote-to-replica-source: Unable to migrate replica %(slave)s from old "
 "replica source %(old_master)s to new source %(new_master)s."
 msgstr ""
 
-#: trove/taskmanager/manager.py:128
+#: trove/taskmanager/manager.py:127
 msgid "Exception demoting old replica source"
 msgstr ""
 
-#: trove/taskmanager/manager.py:136
+#: trove/taskmanager/manager.py:135
 #, python-format
 msgid ""
 "promote-to-replica-source %(id)s: The following replicas may not have "
 "been switched: %(replicas)s"
 msgstr ""
 
-#: trove/taskmanager/manager.py:172
+#: trove/taskmanager/manager.py:171
 #, python-format
 msgid "Replicas of %s not all replicating from same master"
 msgstr ""
 
-#: trove/taskmanager/manager.py:198
+#: trove/taskmanager/manager.py:197
 #, python-format
 msgid ""
 "eject-replica-source: Unable to migrate replica %(slave)s from old "
 "replica source %(old_master)s to new source %(new_master)s."
 msgstr ""
 
-#: trove/taskmanager/manager.py:214
+#: trove/taskmanager/manager.py:213
 #, python-format
 msgid ""
 "eject-replica-source %(id)s: The following replicas may not have been "
 "switched: %(replicas)s"
 msgstr ""
 
-#: trove/taskmanager/manager.py:293
+#: trove/taskmanager/manager.py:292
 #, python-format
 msgid "Could not create replica %(num)d of %(count)d."
 msgstr ""
 
-#: trove/taskmanager/manager.py:321
+#: trove/taskmanager/manager.py:320
 msgid "Cannot create multiple non-replica instances."
 msgstr ""
 
-#: trove/taskmanager/models.py:261
+#: trove/taskmanager/models.py:260
 msgid "Timeout for all instance service statuses to become ready."
 msgstr ""
 
-#: trove/taskmanager/models.py:268
+#: trove/taskmanager/models.py:267
 #, python-format
 msgid "Some instances failed to become ready: %s"
 msgstr ""
 
-#: trove/taskmanager/models.py:289
+#: trove/taskmanager/models.py:288
 msgid "timeout for instances to be marked as deleted."
 msgstr ""
 
-#: trove/taskmanager/models.py:337
+#: trove/taskmanager/models.py:336
 #, python-format
 msgid "Created instance %s successfully."
 msgstr ""
 
-#: trove/taskmanager/models.py:340
+#: trove/taskmanager/models.py:339
 #, python-format
 msgid ""
 "Failed to create instance %s. Timeout waiting for instance to become "
 "active. No usage create-event was sent."
 msgstr ""
 
-#: trove/taskmanager/models.py:345
+#: trove/taskmanager/models.py:344
 #, python-format
 msgid "Failed to send usage create-event for instance %s."
 msgstr ""
 
-#: trove/taskmanager/models.py:356
+#: trove/taskmanager/models.py:355
 #, python-format
 msgid "Creating instance %s."
 msgstr ""
 
-#: trove/taskmanager/models.py:368
+#: trove/taskmanager/models.py:367
 #, python-format
 msgid "Error creating security group for instance: %s"
 msgstr ""
 
-#: trove/taskmanager/models.py:439
+#: trove/taskmanager/models.py:438
 #, python-format
 msgid "Error creating DNS entry for instance: %s"
 msgstr ""
 
-#: trove/taskmanager/models.py:453
+#: trove/taskmanager/models.py:452
 #, python-format
 msgid "Error attaching instance %s as replica."
 msgstr ""
 
-#: trove/taskmanager/models.py:486
+#: trove/taskmanager/models.py:485
 #, python-format
 msgid "Unable to create replication snapshot record for instance: %s"
 msgstr ""
 
-#: trove/taskmanager/models.py:520
+#: trove/taskmanager/models.py:519
 #, python-format
 msgid ""
 "Error creating replication snapshot from instance %(source)s for new "
 "replica %(replica)s."
 msgstr ""
 
-#: trove/taskmanager/models.py:536
+#: trove/taskmanager/models.py:535
 #, python-format
 msgid ""
 "An error occurred while deleting a bad replication snapshot from instance"
 " %(source)s."
 msgstr ""
 
-#: trove/taskmanager/models.py:557
+#: trove/taskmanager/models.py:556
 #, python-format
 msgid "Service status: %(status)s"
 msgstr ""
 
-#: trove/taskmanager/models.py:560
+#: trove/taskmanager/models.py:559
 #, python-format
 msgid "Service error description: %(desc)s"
 msgstr ""
 
-#: trove/taskmanager/models.py:568
+#: trove/taskmanager/models.py:567
 #, python-format
 msgid "Trove instance status: %(action)s"
 msgstr ""
 
-#: trove/taskmanager/models.py:571
+#: trove/taskmanager/models.py:570
 #, python-format
 msgid "Trove instance status description: %(text)s"
 msgstr ""
 
-#: trove/taskmanager/models.py:593
+#: trove/taskmanager/models.py:592
 #, python-format
 msgid "Service not active, status: %s"
 msgstr ""
 
-#: trove/taskmanager/models.py:599
+#: trove/taskmanager/models.py:598
 #, python-format
 msgid "Server not active, status: %s"
 msgstr ""
 
-#: trove/taskmanager/models.py:634
+#: trove/taskmanager/models.py:633
 #, python-format
 msgid "Error creating server and volume for instance %s"
 msgstr ""
 
-#: trove/taskmanager/models.py:739
+#: trove/taskmanager/models.py:738
 #, python-format
 msgid "Error occurred during Heat stack creation for instance %s."
 msgstr ""
 
-#: trove/taskmanager/models.py:770
+#: trove/taskmanager/models.py:769
 #, python-format
 msgid "Failed to create server for instance %s"
 msgstr ""
 
-#: trove/taskmanager/models.py:788
+#: trove/taskmanager/models.py:787
 #, python-format
 msgid "Failed to create volume for instance %s"
 msgstr ""
 
-#: trove/taskmanager/models.py:921
+#: trove/taskmanager/models.py:920
 #, python-format
 msgid ""
 "Failed to create DNS entry for instance %(instance)s. Server status was "
 "%(status)s)."
 msgstr ""
 
-#: trove/taskmanager/models.py:932
+#: trove/taskmanager/models.py:931
 msgid "Creating dns entry..."
 msgstr ""
 
-#: trove/taskmanager/models.py:953
+#: trove/taskmanager/models.py:952
 #, 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:1011
+#: trove/taskmanager/models.py:1010
 #, python-format
 msgid "Error stopping the datastore before attempting to delete instance id %s."
 msgstr ""
 
-#: trove/taskmanager/models.py:1022
+#: trove/taskmanager/models.py:1021
 #, python-format
 msgid "Error during delete compute server %s"
 msgstr ""
 
-#: trove/taskmanager/models.py:1031
+#: trove/taskmanager/models.py:1030
 #, python-format
 msgid "Error during dns entry of instance %(id)s: %(ex)s"
 msgstr ""
 
-#: trove/taskmanager/models.py:1040
+#: trove/taskmanager/models.py:1039
 #, python-format
 msgid ""
 "Server %(server_id)s entered ERROR status when deleting instance "
 "%(instance_id)s!"
 msgstr ""
 
-#: trove/taskmanager/models.py:1051
+#: trove/taskmanager/models.py:1050
 #, python-format
 msgid ""
 "Failed to delete instance %(instance_id)s: Timeout deleting compute "
 "server %(server_id)s"
 msgstr ""
 
-#: trove/taskmanager/models.py:1061
+#: trove/taskmanager/models.py:1060
 #, python-format
 msgid "Deleting volume %(v)s for instance: %(i)s."
 msgstr ""
 
-#: trove/taskmanager/models.py:1065
+#: trove/taskmanager/models.py:1064
 #, python-format
 msgid "Error deleting volume of instance %(id)s."
 msgstr ""
 
-#: trove/taskmanager/models.py:1080
+#: trove/taskmanager/models.py:1079
 #, 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:1086
+#: trove/taskmanager/models.py:1085
 #, python-format
 msgid "Resized volume for instance %s successfully."
 msgstr ""
 
-#: trove/taskmanager/models.py:1089
+#: trove/taskmanager/models.py:1088
 #, python-format
 msgid ""
 "Resizing instance %(instance_id)s from flavor %(old_flavor)s to "
 "%(new_flavor)s."
 msgstr ""
 
-#: trove/taskmanager/models.py:1095
+#: trove/taskmanager/models.py:1094
 #, python-format
 msgid "Resized instance %s successfully."
 msgstr ""
 
-#: trove/taskmanager/models.py:1098
+#: trove/taskmanager/models.py:1097
 #, python-format
 msgid "Initiating migration to host %s."
 msgstr ""
 
-#: trove/taskmanager/models.py:1103
+#: trove/taskmanager/models.py:1102
 #, python-format
 msgid "Initiating backup for instance %s."
 msgstr ""
 
-#: trove/taskmanager/models.py:1117
+#: trove/taskmanager/models.py:1116
 #, python-format
 msgid "Failed to get replication snapshot from %s."
 msgstr ""
 
-#: trove/taskmanager/models.py:1131
+#: trove/taskmanager/models.py:1130
 #, python-format
 msgid "Failed to detach replica %s."
 msgstr ""
 
-#: trove/taskmanager/models.py:1144
+#: trove/taskmanager/models.py:1143
 #, python-format
 msgid "Failed to attach replica %s."
 msgstr ""
 
-#: trove/taskmanager/models.py:1230
+#: trove/taskmanager/models.py:1229
 #, python-format
 msgid "Cannot reboot instance. DB status is %s."
 msgstr ""
 
-#: trove/taskmanager/models.py:1236
+#: trove/taskmanager/models.py:1235
 #, python-format
 msgid "Rebooting instance %s."
 msgstr ""
 
-#: trove/taskmanager/models.py:1253
+#: trove/taskmanager/models.py:1252
 #, python-format
 msgid "Rebooted instance %s successfully."
 msgstr ""
 
-#: trove/taskmanager/models.py:1255
+#: trove/taskmanager/models.py:1254
 #, python-format
 msgid "Failed to reboot instance %(id)s: %(e)s"
 msgstr ""
 
-#: trove/taskmanager/models.py:1262
+#: trove/taskmanager/models.py:1261
 #, python-format
 msgid "Initiating datastore restart on instance %s."
 msgstr ""
 
-#: trove/taskmanager/models.py:1266
+#: trove/taskmanager/models.py:1265
 #, python-format
 msgid "Failed to initiate datastore restart on instance %s."
 msgstr ""
 
-#: trove/taskmanager/models.py:1272
+#: trove/taskmanager/models.py:1271
 #, python-format
 msgid "Initiating datastore configurations update on instance %s."
 msgstr ""
 
-#: trove/taskmanager/models.py:1295
+#: trove/taskmanager/models.py:1294
 #, python-format
 msgid "Failed to initiate datastore configurations update on instance %s."
 msgstr ""
 
-#: trove/taskmanager/models.py:1299
+#: trove/taskmanager/models.py:1298
 #, python-format
 msgid ""
 "Initiating configuration group %(config_id)s removal from instance "
 "%(instance_id)s."
 msgstr ""
 
-#: trove/taskmanager/models.py:1414
+#: trove/taskmanager/models.py:1416
 #, python-format
 msgid "Deleting backup %s."
 msgstr ""
 
-#: trove/taskmanager/models.py:1427
+#: trove/taskmanager/models.py:1429
 #, python-format
 msgid "Error occurred when deleting from swift. Details: %s"
 msgstr ""
 
-#: trove/taskmanager/models.py:1435
+#: trove/taskmanager/models.py:1437
 #, python-format
 msgid "Deleted backup %s successfully."
 msgstr ""
 
-#: trove/taskmanager/models.py:1455
+#: trove/taskmanager/models.py:1457
 #, 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:1464
+#: trove/taskmanager/models.py:1467
 #, 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:1472
+#: trove/taskmanager/models.py:1475
 #, python-format
 msgid ""
 "%(func)s encountered an error when attempting to resize the volume for "
@@ -2863,7 +2895,7 @@ msgid ""
 "restarting the guest."
 msgstr ""
 
-#: trove/taskmanager/models.py:1481
+#: trove/taskmanager/models.py:1484
 #, python-format
 msgid ""
 "%(func)s encountered an error when attempting to resize the volume for "
@@ -2871,57 +2903,57 @@ msgid ""
 "and then restarting the guest."
 msgstr ""
 
-#: trove/taskmanager/models.py:1587
+#: trove/taskmanager/models.py:1592
 #, python-format
 msgid "Failed to get volume %(vol_id)s"
 msgstr ""
 
-#: trove/taskmanager/models.py:1601
+#: trove/taskmanager/models.py:1606
 #, python-format
 msgid "Timeout trying to extend the volume %(vol_id)s for instance %(id)s"
 msgstr ""
 
-#: trove/taskmanager/models.py:1614
+#: trove/taskmanager/models.py:1619
 #, python-format
 msgid ""
 "Error encountered trying to verify extend for the volume %(vol_id)s for "
 "instance %(id)s"
 msgstr ""
 
-#: trove/taskmanager/models.py:1661
+#: trove/taskmanager/models.py:1666
 #, 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:1784
+#: trove/taskmanager/models.py:1789
 msgid "Exception during nova action."
 msgstr ""
 
-#: trove/taskmanager/models.py:1786
+#: trove/taskmanager/models.py:1791
 #, python-format
 msgid "Reverting action for instance %s"
 msgstr ""
 
-#: trove/taskmanager/models.py:1792
+#: trove/taskmanager/models.py:1797
 msgid "Restarting datastore."
 msgstr ""
 
-#: trove/taskmanager/models.py:1795
+#: trove/taskmanager/models.py:1800
 msgid "Cannot restart datastore because Nova server status is not ACTIVE"
 msgstr ""
 
-#: trove/taskmanager/models.py:1798
+#: trove/taskmanager/models.py:1803
 #, python-format
 msgid "Error resizing instance %s."
 msgstr ""
 
-#: trove/taskmanager/models.py:1860
+#: trove/taskmanager/models.py:1865
 msgid "Error sending reset_configuration call."
 msgstr ""
 
-#: trove/tests/db/migrations.py:77
+#: trove/tests/db/migrations.py:74
 #, python-format
 msgid ""
 "The following migration scripts are missing a downgrade implementation:\n"