From f45e3caf7c8c9b4a6f4807a6a0cbe99aacddd8cd Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 13 Nov 2014 12:21:49 +0000
Subject: [PATCH] Removed the apparently obsolete "Two spaces after dot" English spacing convention

---
 opendj3-server-dev/src/messages/messages/extension.properties  |  282 ++++----
 opendj3-server-dev/src/messages/messages/config.properties     |  378 +++++-----
 opendj3-server-dev/src/messages/messages/dsconfig.properties   |    6 
 opendj3-server-dev/src/messages/messages/admin.properties      |    8 
 opendj3-server-dev/src/messages/messages/protocol.properties   |  326 +++++-----
 opendj3-server-dev/src/messages/messages/schema.properties     |  112 +-
 opendj3-server-dev/src/messages/messages/version.properties    |   30 
 opendj3-server-dev/src/messages/messages/jeb.properties        |  110 +-
 opendj3-server-dev/src/messages/messages/utility.properties    |  106 +-
 opendj3-server-dev/src/messages/messages/core.properties       |  298 ++++----
 opendj3-server-dev/src/messages/messages/quicksetup.properties |  123 +-
 opendj3-server-dev/src/messages/messages/plugin.properties     |  111 +-
 opendj3-server-dev/src/messages/messages/task.properties       |   12 
 opendj3-server-dev/src/messages/messages/log.properties        |    6 
 14 files changed, 951 insertions(+), 957 deletions(-)

diff --git a/opendj3-server-dev/src/messages/messages/admin.properties b/opendj3-server-dev/src/messages/messages/admin.properties
index 5b04bf8..eefa92a 100644
--- a/opendj3-server-dev/src/messages/messages/admin.properties
+++ b/opendj3-server-dev/src/messages/messages/admin.properties
@@ -57,11 +57,11 @@
  trying to decode the managed object configuration entry %s: %s
 ERR_ADMIN_CANNOT_INSTANTIATE_CLASS_6=The Directory Server was unable \
  to load class %s and use it to create a component instance as defined in \
- configuration entry %s.  The error that occurred was:  %s.  This component \
+ configuration entry %s. The error that occurred was: %s. This component \
  will be disabled
 ERR_ADMIN_CANNOT_OPEN_JAR_FILE_9=The Directory Server jar file %s in \
  directory %s cannot be loaded because an unexpected error occurred while \
- trying to open the file for reading:  %s
+ trying to open the file for reading: %s
 ERR_ADMIN_NO_EXTENSIONS_DIR_12=The extensions directory %s does not \
  exist, therefore no extensions will be loaded
 ERR_ADMIN_EXTENSIONS_DIR_NOT_DIRECTORY_13=Unable to read the Directory \
@@ -69,12 +69,12 @@
  directory
 ERR_ADMIN_EXTENSIONS_CANNOT_LIST_FILES_14=Unable to read the Directory \
  Server extensions from directory %s because an unexpected error occurred \
- while trying to list the files in that directory:  %s
+ while trying to list the files in that directory: %s
 ERR_ADMIN_CANNOT_FIND_CORE_MANIFEST_15=The core administration manifest \
  file %s cannot be located
 ERR_ADMIN_CANNOT_READ_EXTENSION_MANIFEST_17=The administration \
  manifest file %s associated with the extension %s cannot be loaded because an \
- unexpected error occurred while trying to read it:  %s
+ unexpected error occurred while trying to read it: %s
 INFO_ADMIN_TOOL_DESCRIPTION_18=This utility can be used to perform operations \
  in the Directory Server administration framework
 INFO_ADMIN_SUBCMD_CREATE_GROUP_DESCRIPTION_19=Create a new server group
diff --git a/opendj3-server-dev/src/messages/messages/config.properties b/opendj3-server-dev/src/messages/messages/config.properties
index a22ba53..b5bea5a 100644
--- a/opendj3-server-dev/src/messages/messages/config.properties
+++ b/opendj3-server-dev/src/messages/messages/config.properties
@@ -51,7 +51,7 @@
  have at least one value but the resulted operation would have removed all \
  values
 ERR_CONFIG_ATTR_REJECTED_VALUE_2=Provided value %s for configuration \
- attribute %s was rejected.  The reason provided was:  %s
+ attribute %s was rejected. The reason provided was: %s
 ERR_CONFIG_ATTR_SET_VALUES_IS_SINGLE_VALUED_3=Configuration attribute %s \
  is single-valued, but multiple values were provided
 ERR_CONFIG_ATTR_ADD_VALUES_IS_SINGLE_VALUED_4=Configuration attribute %s \
@@ -75,7 +75,7 @@
  allowable range for an int
 ERR_CONFIG_ATTR_INVALID_INT_VALUE_11=Unable to set the value for integer \
  configuration attribute %s because the provided value %s cannot be \
- interpreted as an integer value:  %s
+ interpreted as an integer value: %s
 ERR_CONFIG_ATTR_INT_BELOW_LOWER_BOUND_12=Unable to set the value for \
  configuration attribute %s because the provided value %d is less than the \
  lowest allowed value of %d
@@ -83,7 +83,7 @@
  configuration attribute %s because the provided value %d is greater than the \
  largest allowed value of %d
 ERR_CONFIG_ATTR_INT_COULD_NOT_PARSE_14=Unable to parse value %s for \
- configuration attribute %s as an integer value:  %s
+ configuration attribute %s as an integer value: %s
 ERR_CONFIG_ATTR_NO_STRING_VALUE_15=Unable to retrieve the value for \
  configuration attribute %s as a string because that attribute does not have \
  any values
@@ -100,9 +100,9 @@
  value and a unit for configuration attribute %s because no value/unit \
  delimiter could be found
 ERR_CONFIG_ATTR_COULD_NOT_PARSE_INT_COMPONENT_21=Could not decode the \
- integer portion of value %s for configuration attribute %s:  %s
+ integer portion of value %s for configuration attribute %s: %s
 ERR_CONFIG_ATTR_INVALID_VALUE_WITH_UNIT_22=The provided value %s for \
- integer with unit attribute %s is not allowed:  %s
+ integer with unit attribute %s is not allowed: %s
 ERR_CONFIG_ENTRY_CONFLICTING_CHILD_23=Unable to add configuration entry \
  %s as a child of configuration entry %s because a child entry was already \
  found with that DN
@@ -115,23 +115,23 @@
 ERR_CONFIG_FILE_DOES_NOT_EXIST_26=The specified configuration file %s \
  does not exist or is not readable
 ERR_CONFIG_FILE_CANNOT_VERIFY_EXISTENCE_27=An unexpected error occurred \
- while attempting to determine whether configuration file %s exists:  %s
+ while attempting to determine whether configuration file %s exists: %s
 ERR_CONFIG_FILE_CANNOT_OPEN_FOR_READ_28=An error occurred while \
- attempting to open the configuration file %s for reading:  %s
+ attempting to open the configuration file %s for reading: %s
 ERR_CONFIG_FILE_READ_ERROR_29=An error occurred while attempting to \
- read the contents of configuration file %s:  %s
+ read the contents of configuration file %s: %s
 ERR_CONFIG_ATTR_OPTIONS_NOT_ALLOWED_30=Invalid configuration attribute \
- %s detected:  the only attribute option allowed in the Directory Server \
+ %s detected: the only attribute option allowed in the Directory Server \
  configuration is "pending" to indicate the set of pending values
 ERR_CONFIG_FILE_INVALID_LDIF_ENTRY_31=An error occurred at or near line \
- %d while trying to parse the configuration from LDIF file %s:  %s
+ %d while trying to parse the configuration from LDIF file %s: %s
 ERR_CONFIG_FILE_EMPTY_32=The specified configuration file %s does not \
  appear to contain any configuration entries
 ERR_CONFIG_FILE_INVALID_BASE_DN_33=The first entry read from LDIF \
  configuration file %s had a DN of "%s" rather than the expected "%s" which \
  should be used as the Directory Server configuration root
 ERR_CONFIG_FILE_GENERIC_ERROR_34=An unexpected error occurred while \
- attempting to process the Directory Server configuration file %s:  %s
+ attempting to process the Directory Server configuration file %s: %s
 ERR_CONFIG_FILE_DUPLICATE_ENTRY_35=Configuration entry %s starting at \
  or near line %s in the LDIF configuration file %s has the same DN as another \
  entry already read from that file
@@ -143,36 +143,36 @@
  %d in the configuration LDIF file %s
 ERR_CONFIG_CANNOT_DETERMINE_SERVER_ROOT_38=Unable to determine the \
  Directory Server instance root from either an environment variable or based \
- on the location of the configuration file.  Please set an environment \
+ on the location of the configuration file. Please set an environment \
  variable named %s with a value containing the absolute path to the server \
  installation root
 ERR_CONFIG_FILE_WRITE_ERROR_39=An unexpected error occurred while \
- trying to write configuration entry %s to LDIF:  %s
+ trying to write configuration entry %s to LDIF: %s
 ERR_CONFIG_FILE_CLOSE_ERROR_40=An unexpected error occurred while \
- trying to close the LDIF writer:  %s
+ trying to close the LDIF writer: %s
 ERR_CONFIG_FILE_UNWILLING_TO_IMPORT_41=The Directory Server \
  configuration may not be altered by importing a new configuration from LDIF
 WARN_CONFIG_LOGGER_NO_ACTIVE_ACCESS_LOGGERS_44=There are no active \
- access loggers defined in the Directory Server configuration.  No access \
+ access loggers defined in the Directory Server configuration. No access \
  logging will be performed
 WARN_CONFIG_LOGGER_NO_ACTIVE_ERROR_LOGGERS_45=There are no active \
- error loggers defined in the Directory Server configuration.  No error \
+ error loggers defined in the Directory Server configuration. No error \
  logging will be performed
 ERR_CONFIG_LOGGER_CANNOT_CREATE_LOGGER_49=An error occurred while \
  attempting to create a Directory Server logger from the information in \
- configuration entry %s:  %s
+ configuration entry %s: %s
 ERR_CONFIG_LOGGER_INVALID_OBJECTCLASS_50=Configuration entry %s does \
  not contain a valid objectclass for a Directory Server access, error, or \
  debug logger definition
 ERR_CONFIG_LOGGER_INVALID_ACCESS_LOGGER_CLASS_54=Class %s specified in \
  attribute ds-cfg-java-class of configuration entry %s cannot be \
- instantiated as a Directory Server access logger:  %s
+ instantiated as a Directory Server access logger: %s
 ERR_CONFIG_LOGGER_INVALID_ERROR_LOGGER_CLASS_55=Class %s specified in \
  attribute ds-cfg-java-class of configuration entry %s cannot be \
- instantiated as a Directory Server error logger:  %s
+ instantiated as a Directory Server error logger: %s
 ERR_CONFIG_LOGGER_INVALID_DEBUG_LOGGER_CLASS_56=Class %s specified in \
  attribute ds-cfg-java-class of configuration entry %s cannot be \
- instantiated as a Directory Server debug logger:  %s
+ instantiated as a Directory Server debug logger: %s
 ERR_CONFIG_ATTR_MULTIPLE_PENDING_VALUE_SETS_64=Configuration attribute \
  %s appears to contain multiple pending value sets
 ERR_CONFIG_ATTR_MULTIPLE_ACTIVE_VALUE_SETS_65=Configuration attribute %s \
@@ -186,7 +186,7 @@
  configuration attribute %s as a set of integer values because the array \
  contained elements of an invalid type (%s)
 ERR_CONFIG_ATTR_INVALID_STRING_VALUE_69=Unable to parse value %s for \
- configuration attribute %s as a string value:  %s
+ configuration attribute %s as a string value: %s
 ERR_CONFIG_ATTR_STRING_INVALID_TYPE_70=Unable to parse value %s for \
  configuration attribute %s as a string value because the element was of an \
  invalid type (%s)
@@ -202,23 +202,23 @@
  component registered with configuration entry %s
 ERR_CONFIG_JMX_CANNOT_REGISTER_MBEAN_83=The Directory Server could not \
  register a JMX MBean for the component associated with configuration entry \
- %s:  %s
+ %s: %s
 ERR_CONFIG_LDIF_WRITE_ERROR_84=An unexpected error occurred while \
- trying to export the Directory Server configuration to LDIF:  %s
+ trying to export the Directory Server configuration to LDIF: %s
 ERR_CONFIG_WORK_QUEUE_TOO_MANY_FAILURES_94=Worker thread "%s" has \
  experienced too many repeated failures while attempting to retrieve the next \
  operation from the work queue (%d failures experienced, maximum of %d \
- failures allowed).  This worker thread will be destroyed
+ failures allowed). This worker thread will be destroyed
 ERR_CONFIG_WORK_QUEUE_CANNOT_CREATE_MONITOR_95=A problem occurred \
  while trying to create and start an instance of class %s to use as a monitor \
- provider for the Directory Server work queue:  %s.  No monitor information \
+ provider for the Directory Server work queue: %s. No monitor information \
  will be available for the work queue
 ERR_CONFIG_ATTR_DN_NULL_98=A null value was provided for DN \
  configuration attribute %s
 ERR_CONFIG_ATTR_DN_CANNOT_PARSE_99=An error occurred while trying to \
- parse value "%s" of attribute %s as a DN:  %s
+ parse value "%s" of attribute %s as a DN: %s
 ERR_CONFIG_ATTR_INVALID_DN_VALUE_100=Unable to parse value %s for \
- configuration attribute %s as a DN:  %s
+ configuration attribute %s as a DN: %s
 ERR_CONFIG_ATTR_DN_INVALID_TYPE_101=Unable to parse value %s for \
  configuration attribute %s as a DN because the element was of an invalid type \
  (%s)
@@ -227,64 +227,64 @@
  elements of an invalid type (%s)
 ERR_CONFIG_CANNOT_REGISTER_AS_PRIVATE_SUFFIX_103=An unexpected error \
  occurred while trying to register the configuration handler base DN "%s" as a \
- private suffix with the Directory Server:  %s
+ private suffix with the Directory Server: %s
 ERR_CONFIG_BACKEND_CANNOT_GET_CONFIG_BASE_104=An error occurred while \
  trying to retrieve configuration entry cn=Backends,cn=config in order to \
- initialize the Directory Server backends:  %s
+ initialize the Directory Server backends: %s
 ERR_CONFIG_BACKEND_BASE_DOES_NOT_EXIST_105=The entry \
  cn=Backends,cn=config does not appear to exist in the Directory Server \
- configuration.  This is a required entry
+ configuration. This is a required entry
 ERR_CONFIG_BACKEND_ERROR_INTERACTING_WITH_BACKEND_ENTRY_107=An \
  unexpected error occurred while interacting with backend configuration entry \
- %s:  %s
+ %s: %s
 INFO_CONFIG_BACKEND_ATTR_DESCRIPTION_CLASS_109=Fully-qualified \
  name of the Java class that should provide the core logic for this backend \
- implementation.  Changes to this configuration attribute will not take effect \
+ implementation. Changes to this configuration attribute will not take effect \
  until the backend is disabled and re-enabled or the server is restarted
 INFO_CONFIG_BACKEND_DISABLED_111=The backend defined in configuration entry \
  %s is marked as disabled and therefore will not be used
 ERR_CONFIG_BACKEND_UNABLE_TO_DETERMINE_ENABLED_STATE_112=An unexpected \
  error occurred while attempting to determine whether the backend associated \
- with configuration entry %s should be enabled or disabled:  %s.  It will be \
+ with configuration entry %s should be enabled or disabled: %s. It will be \
  disabled
 ERR_CONFIG_BACKEND_CANNOT_INSTANTIATE_115=The Directory Server was \
  unable to load class %s and use it to create a backend instance as defined in \
- configuration entry %s.  The error that occurred was:  %s.  This backend will \
+ configuration entry %s. The error that occurred was: %s. This backend will \
  be disabled
 ERR_CONFIG_BACKEND_CANNOT_INITIALIZE_116=An error occurred while \
  trying to initialize a backend loaded from class %s with the information in \
- configuration entry %s:  %s.  This backend will be disabled
+ configuration entry %s: %s. This backend will be disabled
 ERR_CONFIG_BACKEND_CLASS_NOT_BACKEND_117=The class %s specified in \
  configuration entry %s does not contain a valid Directory Server backend \
  implementation
 NOTE_CONFIG_BACKEND_ACTION_REQUIRED_TO_CHANGE_CLASS_118=The requested \
  change to configuration entry %s would cause the class for the associated \
- backend to change from %s to %s.  This change will not take effect until the \
+ backend to change from %s to %s. This change will not take effect until the \
  backend is disabled and re-enabled, or until the Directory Server is \
  restarted
 NOTE_CONFIG_BACKEND_CANNOT_REMOVE_BACKEND_WITH_SUBORDINATES_119=The backend \
- defined in configuration entry %s has one or more subordinate backends.  A \
+ defined in configuration entry %s has one or more subordinate backends. A \
  backend may not be removed if it has subordinate backends
 ERR_CONFIG_MONITOR_INITIALIZATION_FAILED_140=An error occurred while \
  trying to initialize an instance of class %s as a monitor provider as defined \
- in configuration entry %s:  %s
+ in configuration entry %s: %s
 ERR_CONFIG_CONNHANDLER_CANNOT_INITIALIZE_154=An error occurred while \
  trying to initialize a connection handler loaded from class %s with the \
- information in configuration entry %s:  %s.  This connection handler will be \
+ information in configuration entry %s: %s. This connection handler will be \
  disabled
 ERR_CONFIG_SCHEMA_MR_CANNOT_INITIALIZE_172=An error occurred while \
  trying to initialize a matching rule loaded from class %s with the \
- information in configuration entry %s:  %s.  This matching rule will be \
+ information in configuration entry %s: %s. This matching rule will be \
  disabled
 WARN_CONFIG_SCHEMA_MR_CONFLICTING_MR_173=The matching rule defined in \
  configuration entry %s conflicts with another matching rule defined in the \
- server configuration:  %s.  This matching rule will not be used
+ server configuration: %s. This matching rule will not be used
 ERR_CONFIG_SCHEMA_SYNTAX_CANNOT_INITIALIZE_186=An error occurred while \
  trying to initialize an attribute syntax loaded from class %s with the \
- information in configuration entry %s:  %s.  This syntax will be disabled
+ information in configuration entry %s: %s. This syntax will be disabled
 WARN_CONFIG_SCHEMA_SYNTAX_CONFLICTING_SYNTAX_187=The attribute syntax \
  defined in configuration entry %s conflicts with another syntax defined in \
- the server configuration:  %s.  This attribute syntax will not be used
+ the server configuration: %s. This attribute syntax will not be used
 ERR_CONFIG_SCHEMA_NO_SCHEMA_DIR_188=Unable to read the Directory \
  Server schema definitions because the schema directory %s does not exist
 ERR_CONFIG_SCHEMA_DIR_NOT_DIRECTORY_189=Unable to read the Directory \
@@ -292,39 +292,39 @@
  directory
 ERR_CONFIG_SCHEMA_CANNOT_LIST_FILES_190=Unable to read the Directory \
  Server schema definitions from directory %s because an unexpected error \
- occurred while trying to list the files in that directory:  %s
+ occurred while trying to list the files in that directory: %s
 WARN_CONFIG_SCHEMA_CANNOT_OPEN_FILE_191=Schema configuration file %s \
  in directory %s cannot be parsed because an unexpected error occurred while \
- trying to open the file for reading:  %s
+ trying to open the file for reading: %s
 WARN_CONFIG_SCHEMA_CANNOT_READ_LDIF_ENTRY_192=Schema configuration \
  file %s in directory %s cannot be parsed because an unexpected error occurred \
- while trying to read its contents as an LDIF entry:  %s
+ while trying to read its contents as an LDIF entry: %s
 WARN_CONFIG_SCHEMA_CANNOT_PARSE_ATTR_TYPE_193=Unable to parse an \
- attribute type definition from schema configuration file %s:  %s
+ attribute type definition from schema configuration file %s: %s
 WARN_CONFIG_SCHEMA_CONFLICTING_ATTR_TYPE_194=An attribute type read \
  from schema configuration file %s conflicts with another attribute type \
- already read into the schema:  %s.  The later attribute type definition will \
+ already read into the schema: %s. The later attribute type definition will \
  be used
 WARN_CONFIG_SCHEMA_CONFLICTING_OC_195=An objectclass read from schema \
  configuration file %s conflicts with another objectclass already read into \
- the schema:  %s.  The later objectclass definition will be used
+ the schema: %s. The later objectclass definition will be used
 WARN_CONFIG_SCHEMA_CANNOT_PARSE_OC_196=An objectclass read from schema \
-  configuration file %s could not be parsed:  %s
+ configuration file %s could not be parsed: %s
 ERR_CONFIG_ENTRYCACHE_CANNOT_INSTALL_DEFAULT_CACHE_200=An unexpected \
  error occurred that prevented the server from installing its default entry \
- cache framework:  %s
+ cache framework: %s
 WARN_CONFIG_ENTRYCACHE_NO_CONFIG_ENTRY_201=The entry cache \
  configuration entry "cn=Entry Caches,cn=config" does not exist in the \
- Directory Server configuration.  No entry cache will be available until this \
+ Directory Server configuration. No entry cache will be available until this \
  entry is created with a valid entry cache configuration
 ERR_CONFIG_ENTRYCACHE_CANNOT_INITIALIZE_CACHE_202=An error occurred \
  while attempting to initialize an instance of class %s for use as the \
- Directory Server entry cache:  %s.  As a result, the entry cache will be \
+ Directory Server entry cache: %s. As a result, the entry cache will be \
  disabled
 ERR_CONFIG_ENTRYCACHE_CONFIG_NOT_ACCEPTABLE_203=The configuration for \
- the entry cache defined in configuration entry %s was not acceptable:  %s
+ the entry cache defined in configuration entry %s was not acceptable: %s
 ERR_CONFIG_ENTRYCACHE_CONFIG_LEVEL_NOT_ACCEPTABLE_204=The configuration \
- for the entry cache defined in configuration entry %s was not acceptable:  \
+ for the entry cache defined in configuration entry %s was not acceptable: \
  the entry cache level %d is already in use
 INFO_WARN_CONFIG_ENTRYCACHE_NO_MONITOR_CONFIG_ENTRY_205=The configuration for \
  the entry cache %s monitor provider was not available. As a result this \
@@ -333,45 +333,45 @@
  the entry cache %s monitor provider was disabled. As a result the monitor \
  provider %s will not be enabled
 ERR_CONFIG_ENTRY_CANNOT_REMOVE_CHILD_215=An unexpected error occurred \
- while attempting to remove entry %s as a child of configuration entry %s:  %s
+ while attempting to remove entry %s as a child of configuration entry %s: %s
 WARN_CONFIG_SCHEMA_CANNOT_PARSE_NAME_FORM_216=Unable to parse a name \
- form definition from schema configuration file %s:  %s
+ form definition from schema configuration file %s: %s
 WARN_CONFIG_SCHEMA_CONFLICTING_NAME_FORM_217=A name form read from \
  schema configuration file %s conflicts with another name form already read \
- into the schema:  %s.  The later name form definition will be used
+ into the schema: %s. The later name form definition will be used
 WARN_CONFIG_SCHEMA_CANNOT_PARSE_DCR_218=Unable to parse a DIT content \
- rule definition from schema configuration file %s:  %s
+ rule definition from schema configuration file %s: %s
 WARN_CONFIG_SCHEMA_CONFLICTING_DCR_219=A DIT content rule read from \
  schema configuration file %s conflicts with another DIT content rule already \
- read into the schema:  %s.  The later DIT content rule definition will be \
+ read into the schema: %s. The later DIT content rule definition will be \
  used
 WARN_CONFIG_SCHEMA_CANNOT_PARSE_DSR_220=Unable to parse a DIT \
- structure rule definition from schema configuration file %s:  %s
+ structure rule definition from schema configuration file %s: %s
 WARN_CONFIG_SCHEMA_CONFLICTING_DSR_221=A DIT structure rule read from \
  schema configuration file %s conflicts with another DIT structure rule \
- already read into the schema:  %s.  The later DIT structure rule definition \
+ already read into the schema: %s. The later DIT structure rule definition \
  will be used
 WARN_CONFIG_SCHEMA_CANNOT_PARSE_MRU_222=Unable to parse a matching \
- rule use definition from schema configuration file %s:  %s
+ rule use definition from schema configuration file %s: %s
 WARN_CONFIG_SCHEMA_CONFLICTING_MRU_223=A matching rule use read from \
  schema configuration file %s conflicts with another matching rule use already \
- read into the schema:  %s.  The later matching rule use definition will be \
+ read into the schema: %s. The later matching rule use definition will be \
  used
 ERR_CONFIG_ATTR_READ_ONLY_228=Configuration attribute %s is read-only \
  and its values may not be altered
 ERR_CONFIG_PLUGIN_CANNOT_INITIALIZE_245=An error occurred while \
  attempting to initialize an instance of class %s as a Directory Server plugin \
- using the information in configuration entry %s:  %s.  This plugin will be \
+ using the information in configuration entry %s: %s. This plugin will be \
  disabled
 ERR_CONFIG_EXTOP_INVALID_CLASS_256=Class %s specified in configuration \
  entry %s does not contain a valid extended operation handler implementation: \
  %s
 ERR_CONFIG_EXTOP_INITIALIZATION_FAILED_261=An error occurred while \
  trying to initialize an instance of class %s as an extended operation handler \
- as defined in configuration entry %s:  %s
+ as defined in configuration entry %s: %s
 ERR_CONFIG_SASL_INITIALIZATION_FAILED_277=An error occurred while trying \
  to initialize an instance of class %s as a SASL mechanism handler as defined \
- in configuration entry %s:  %s
+ in configuration entry %s: %s
 ERR_CONFIG_FILE_ADD_ALREADY_EXISTS_280=Entry %s cannot be added to the \
  Directory Server configuration because another configuration entry already \
  exists with that DN
@@ -384,7 +384,7 @@
  registered with the parent entry %s rejected this change with the message: \
  %s
 ERR_CONFIG_FILE_ADD_FAILED_284=An unexpected error occurred while \
- attempting to add configuration entry %s as a child of entry %s:  %s
+ attempting to add configuration entry %s as a child of entry %s: %s
 ERR_CONFIG_FILE_DELETE_NO_SUCH_ENTRY_285=Entry %s cannot be removed from \
  the Directory Server configuration because the specified entry does not exist
 ERR_CONFIG_FILE_DELETE_HAS_CHILDREN_286=Entry %s cannot be removed from \
@@ -395,14 +395,14 @@
  removing the configuration root entry is not allowed
 ERR_CONFIG_FILE_DELETE_REJECTED_288=Entry %s cannot be removed from the \
  Directory Server configuration because one of the delete listeners registered \
- with the parent entry %s rejected this change with the message:  %s
+ with the parent entry %s rejected this change with the message: %s
 ERR_CONFIG_FILE_DELETE_FAILED_289=An unexpected error occurred while \
- attempting to remove configuration entry %s as a child of entry %s:  %s
+ attempting to remove configuration entry %s as a child of entry %s: %s
 ERR_CONFIG_FILE_MODIFY_NO_SUCH_ENTRY_290=Entry %s cannot be modified \
  because the specified entry does not exist
 ERR_CONFIG_FILE_MODIFY_REJECTED_BY_CHANGE_LISTENER_291=Entry %s cannot \
  be modified because one of the configuration change listeners registered for \
- that entry rejected the change:  %s
+ that entry rejected the change: %s
 ERR_CONFIG_FILE_SEARCH_NO_SUCH_BASE_293=The search operation cannot be \
  processed because base entry %s does not exist
 ERR_CONFIG_FILE_SEARCH_INVALID_SCOPE_294=The search operation cannot be \
@@ -412,62 +412,62 @@
  %s
 ERR_CONFIG_FILE_WRITE_CANNOT_RENAME_NEW_CONFIG_301=An error occurred \
  while attempting to rename the new Directory Server configuration from file \
- %s to %s:  %s
+ %s to %s: %s
 ERR_CONFIG_FILE_MODDN_NOT_ALLOWED_302=Modify DN operations are not \
  allowed in the Directory Server configuration
 INFO_CONFIG_BACKEND_ATTR_DESCRIPTION_BASE_DNS_305=Set of base \
- DNs that should be used for this backend.  It is up to the backend \
+ DNs that should be used for this backend. It is up to the backend \
  implementation as to whether changes to this attribute will automatically \
  take effect
 INFO_CONFIG_KEYMANAGER_DESCRIPTION_ENABLED_313=Indicates whether the \
- Directory Server key manager provider should be enabled.  A key manager \
+ Directory Server key manager provider should be enabled. A key manager \
  provider is required for operations that require access to a key manager \
- (e.g., communication over SSL).  Changes to this configuration attribute will \
+ (e.g., communication over SSL). Changes to this configuration attribute will \
  take effect immediately, but will only impact future attempts to access the \
  key manager
 ERR_CONFIG_TRUSTMANAGER_DESCRIPTION_ENABLED_328=Indicates whether the \
- Directory Server trust manager provider should be enabled.  A trust manager \
+ Directory Server trust manager provider should be enabled. A trust manager \
  provider is required for operations that require access to a trust manager \
- (e.g., communication over SSL).  Changes to this configuration attribute will \
+ (e.g., communication over SSL). Changes to this configuration attribute will \
  take effect immediately, but will only impact future attempts to access the \
  trust manager
 ERR_CONFIG_PWSCHEME_INITIALIZATION_FAILED_376=An error occurred while \
  trying to initialize an instance of class %s as a password storage scheme as \
- defined in configuration entry %s:  %s
+ defined in configuration entry %s: %s
 ERR_CONFIG_PWSCHEME_EXISTS_377=Unable to add a new password storage \
  scheme entry with DN %s because there is already a storage scheme registered \
  with that DN
 INFO_CONFIG_BACKEND_ATTR_DESCRIPTION_BACKEND_ID_382=Unique \
- identifier for this backend.  Changes to this configuration attribute will \
+ identifier for this backend. Changes to this configuration attribute will \
  not take effect until the backend is disabled and re-enabled or the server is \
  restarted
 WARN_CONFIG_BACKEND_DUPLICATE_BACKEND_ID_384=The backend defined in \
  configuration entry %s has a backend ID of %s that conflicts with the backend \
- ID for another backend in the server.  The backend will be disabled
+ ID for another backend in the server. The backend will be disabled
 ERR_CONFIG_BACKUP_CANNOT_GET_MAC_386=An error occurred while \
  attempting to obtain the %s MAC provider to create the signed hash for the \
- backup:  %s
+ backup: %s
 ERR_CONFIG_BACKUP_CANNOT_GET_DIGEST_387=An error occurred while \
  attempting to obtain the %s message digest to create the hash for the backup: \
  %s
 ERR_CONFIG_BACKUP_CANNOT_CREATE_ARCHIVE_FILE_388=An error occurred \
- while trying to create the config archive file %s in directory %s:  %s
+ while trying to create the config archive file %s in directory %s: %s
 ERR_CONFIG_BACKUP_CANNOT_GET_CIPHER_389=An error occurred while \
- attempting to obtain the cipher to use to encrypt the backup:  %s
+ attempting to obtain the cipher to use to encrypt the backup: %s
 ERR_CONFIG_BACKUP_ZIP_COMMENT_390=%s config backup %s
 ERR_CONFIG_BACKUP_CANNOT_DETERMINE_CONFIG_FILE_LOCATION_391=An error \
  occurred while attempting to determine the path to the Directory Server \
- configuration file so that it could be archived:  %s
+ configuration file so that it could be archived: %s
 ERR_CONFIG_BACKUP_CANNOT_BACKUP_CONFIG_FILE_392=An error occurred \
- while attempting to back up configuration file %s:  %s
+ while attempting to back up configuration file %s: %s
 ERR_CONFIG_BACKUP_CANNOT_BACKUP_ARCHIVED_CONFIGS_393=An error occurred \
  while attempting to back up the archived previous configurations from file \
- %s:  %s
+ %s: %s
 ERR_CONFIG_BACKUP_CANNOT_CLOSE_ZIP_STREAM_394=An error occurred while \
- trying to close the config archive file %s in directory %s:  %s
+ trying to close the config archive file %s in directory %s: %s
 ERR_CONFIG_BACKUP_CANNOT_UPDATE_BACKUP_DESCRIPTOR_395=An error \
  occurred while attempting to update the backup descriptor file %s with \
- information about the configuration backup:  %s
+ information about the configuration backup: %s
 ERR_CONFIG_RESTORE_NO_SUCH_BACKUP_396=Unable to restore or verify \
  configuration backup %s in directory %s because no such backup exists
 ERR_CONFIG_RESTORE_NO_BACKUP_FILE_397=Unable to restore or verify \
@@ -477,7 +477,7 @@
  configuration backup %s because the specified archive file %s does not exist
 ERR_CONFIG_RESTORE_CANNOT_CHECK_FOR_ARCHIVE_399=Unable to restore or \
  verify configuration backup %s because an error occurred while trying to \
- determine whether backup archive %s exists:  %s
+ determine whether backup archive %s exists: %s
 ERR_CONFIG_RESTORE_UNKNOWN_DIGEST_400=Unable to restore or verify \
  configuration backup %s because an unsigned hash of this backup is available \
  but the server cannot determine the digest algorithm used to generate this \
@@ -493,41 +493,41 @@
  unsupported MAC algorithm of %s
 ERR_CONFIG_RESTORE_CANNOT_OPEN_BACKUP_FILE_404=Unable to restore or \
  verify configuration backup %s because an error occurred while attempting to \
- open the backup archive file %s:  %s
+ open the backup archive file %s: %s
 ERR_CONFIG_RESTORE_CANNOT_GET_CIPHER_406=Unable to restore or verify \
  configuration backup %s because it is encrypted using an unknown or \
- unsupported cipher:  %s
+ unsupported cipher: %s
 ERR_CONFIG_RESTORE_CANNOT_BACKUP_EXISTING_CONFIG_407=Unable to restore \
  configuration backup %s because an error occurred while attempting to \
- temporarily back up the current configuration files from %s to %s:  %s
+ temporarily back up the current configuration files from %s to %s: %s
 NOTE_CONFIG_RESTORE_RESTORED_OLD_CONFIG_408=An error occurred that \
- prevented the configuration backup from being properly restored.  However, \
+ prevented the configuration backup from being properly restored. However, \
  the original configuration files that were in place before the start of the \
  restore process have been preserved and are now in their original location of \
  %s
 ERR_CONFIG_RESTORE_CANNOT_RESTORE_OLD_CONFIG_409=An error occurred \
- that prevented the configuration backup from being properly restored.  The \
+ that prevented the configuration backup from being properly restored. The \
  original configuration files that were in place before the start of the \
  restore process have been preserved and are contained in the %s directory
 ERR_CONFIG_RESTORE_CANNOT_CREATE_CONFIG_DIRECTORY_410=Unable to \
  restore configuration backup %s because an error occurred while attempting to \
- create a new empty directory %s into which the files should be restored:  %s
+ create a new empty directory %s into which the files should be restored: %s
 ERR_CONFIG_RESTORE_OLD_CONFIG_SAVED_411=An error occurred that \
- prevented the configuration backup from being properly restored.  The \
+ prevented the configuration backup from being properly restored. The \
  original configuration files that were in place before the start of the \
  restore process have been preserved in the %s directory
 ERR_CONFIG_RESTORE_CANNOT_GET_ZIP_ENTRY_412=Unable to restore or \
  verify configuration backup %s because an error occurred while trying to read \
- the next entry from the archive file %s:  %s
+ the next entry from the archive file %s: %s
 ERR_CONFIG_RESTORE_CANNOT_CREATE_FILE_413=Unable to restore \
  configuration backup %s because an error occurred while trying to recreate \
- file %s:  %s
+ file %s: %s
 ERR_CONFIG_RESTORE_CANNOT_PROCESS_ARCHIVE_FILE_414=Unable to restore \
  or verify configuration backup %s because an error occurred while processing \
- archived file %s:  %s
+ archived file %s: %s
 ERR_CONFIG_RESTORE_ERROR_ON_ZIP_STREAM_CLOSE_415=Unable to restore or \
  verify configuration backup %s because an unexpected error occurred while \
- trying to close the archive file %s:  %s
+ trying to close the archive file %s: %s
 NOTE_CONFIG_RESTORE_UNSIGNED_HASH_VALID_416=The message digest calculated \
  from the backup archive matches the digest stored with the backup information
 ERR_CONFIG_RESTORE_UNSIGNED_HASH_INVALID_417=Unable to restore or \
@@ -544,61 +544,61 @@
 NOTE_CONFIG_RESTORE_SUCCESSFUL_421=Configuration backup %s was successfully \
  restored from the archive in directory %s
 ERR_CONFIG_BACKEND_CANNOT_ACQUIRE_SHARED_LOCK_422=The Directory Server \
- was unable to acquire a shared lock for backend %s:  %s.  This generally \
+ was unable to acquire a shared lock for backend %s: %s. This generally \
  means that the backend is in use by a process that requires an exclusive lock \
- (e.g., importing from LDIF or restoring a backup).  This backend will be \
+ (e.g., importing from LDIF or restoring a backup). This backend will be \
  disabled
 WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK_423=An error occurred \
- while attempting to release a shared lock for backend %s:  %s.  This may \
+ while attempting to release a shared lock for backend %s: %s. This may \
  interfere with operations that require exclusive access, including LDIF \
  import and restoring a backup
 INFO_CONFIG_FILE_HEADER_424=This file contains the primary Directory Server \
- configuration.  It must not be directly edited while the server is online. \
+ configuration. It must not be directly edited while the server is online. \
  The server configuration should only be managed using the administration \
  utilities provided with the Directory Server
 ERR_CONFIG_IDMAPPER_INITIALIZATION_FAILED_442=An error occurred while \
  trying to initialize an instance of class %s as an identity mapper as defined \
- in configuration entry %s:  %s
+ in configuration entry %s: %s
 ERR_CONFIG_IDMAPPER_NO_PROXY_MAPPER_DN_448=The Directory Server does \
  not have any identity mapper configured for use in conjunction with proxied \
- authorization V2 operations.  The Directory Server will not be able to \
+ authorization V2 operations. The Directory Server will not be able to \
  process requests containing the proxied authorization control with a \
  username-based authorization ID
 ERR_CONFIG_IDMAPPER_INVALID_PROXY_MAPPER_DN_449=The configured proxied \
  authorization identity mapper DN %s does not refer to an active identity \
- mapper.  The Directory Server will not be able to process requests containing \
+ mapper. The Directory Server will not be able to process requests containing \
  the proxied authorization control with a username-based authorization ID
 ERR_CONFIG_SYNCH_UNABLE_TO_LOAD_PROVIDER_CLASS_463=An error occurred \
  while attempting to load class %s referenced in synchronization provider \
- configuration entry %s:  %s
+ configuration entry %s: %s
 ERR_CONFIG_SYNCH_UNABLE_TO_INSTANTIATE_PROVIDER_464=An error occurred \
  while attempting to instantiate class %s referenced in synchronization \
- provider configuration entry %s:  %s
+ provider configuration entry %s: %s
 ERR_CONFIG_SYNCH_ERROR_INITIALIZING_PROVIDER_465=An error occurred \
  while attempting to initialize the Directory Server synchronization provider \
- referenced in configuration entry %s:  %s
+ referenced in configuration entry %s: %s
 ERR_CONFIG_PWVALIDATOR_INITIALIZATION_FAILED_489=An error occurred while \
  trying to initialize an instance of class %s as a password validator as \
- defined in configuration entry %s:  %s
+ defined in configuration entry %s: %s
 ERR_CONFIG_PWGENERATOR_INITIALIZATION_FAILED_505=An error occurred while \
  trying to initialize an instance of class %s as a password generator as \
- defined in configuration entry %s:  %s
+ defined in configuration entry %s: %s
 ERR_CONFIG_PWPOLICY_NO_POLICIES_514=No password policies have been \
  defined below the cn=Password Policies,cn=config entry in the Directory \
- Server configuration.  At least one password policy configuration must be \
+ Server configuration. At least one password policy configuration must be \
  defined
 ERR_CONFIG_PWPOLICY_INVALID_POLICY_CONFIG_515=The password policy \
- defined in configuration entry %s is invalid:  %s
+ defined in configuration entry %s is invalid: %s
 ERR_CONFIG_PWPOLICY_MISSING_DEFAULT_POLICY_516=The Directory Server \
  default password policy is defined as %s, but that entry does not exist or is \
  not below the password policy configuration base cn=Password \
  Policies,cn=config
 WARN_CONFIG_PWPOLICY_CANNOT_DELETE_DEFAULT_POLICY_517=The specified \
  entry %s is currently defined as the configuration entry for the default \
- password policy.  The default password policy configuration entry may not be \
+ password policy. The default password policy configuration entry may not be \
  removed
 INFO_CONFIG_PWPOLICY_REMOVED_POLICY_518=Password policy entry %s has been \
- removed from the Directory Server configuration.  Any user entries that \
+ removed from the Directory Server configuration. Any user entries that \
  explicitly reference this password policy will no longer be allowed to \
  authenticate
 WARN_CONFIG_AUTHZ_DISABLED_525=Access control has been disabled
@@ -606,52 +606,52 @@
  the %s implementation
 ERR_CONFIG_AUTHZ_UNABLE_TO_INSTANTIATE_HANDLER_533=An error occurred \
  while attempting to instantiate class %s referenced in the access control \
- configuration entry %s:  %s
+ configuration entry %s: %s
 INFO_CONFIG_ROOTDN_DESCRIPTION_ALTERNATE_BIND_DN_540=Specifies one or more \
  alternate bind DNs that may be used to authenticate as the associated root \
  DN, in addition to the actual DN of the root DN configuration entry. \
  Alternate bind DNs must not conflict with the DNs of any other entries in the \
  directory, nor can they conflict with other alternate bind DNs configured for \
- other root DNs.  Changes to this configuration attribute will take effect \
+ other root DNs. Changes to this configuration attribute will take effect \
  immediately
 ERR_CONFIG_ROOTDN_CONFLICTING_MAPPING_541=Unable to register "%s" as \
  an alternate bind DN for user "%s" because it is already registered as an \
  alternate bind DN for root user "%s"
 ERR_CONFIG_ACCTNOTHANDLER_INITIALIZATION_FAILED_558=An error occurred \
  while trying to initialize an instance of class %s as an account status \
- notification handler as defined in configuration entry %s:  %s
+ notification handler as defined in configuration entry %s: %s
 ERR_CONFIG_ACCTNOTHANDLER_EXISTS_559=Unable to add a new account status \
  notification handler entry with DN %s because there is already a notification \
  handler registered with that DN
 ERR_CONFIG_UNABLE_TO_APPLY_STARTUP_CHANGES_563=An error occurred while \
  attempting to apply the changes contained in file %s to the server \
- configuration at startup:  %s
+ configuration at startup: %s
 ERR_CONFIG_ERROR_APPLYING_STARTUP_CHANGE_564=Unable to apply a change \
- at server startup:  %s
+ at server startup: %s
 ERR_CONFIG_UNABLE_TO_APPLY_CHANGES_FILE_565=One or more errors occurred \
  while applying changes on server startup
 ERR_CONFIG_BACKEND_MODE_INVALID_567=Configuration entry %s does not \
  contain a valid value for configuration attribute ds-cfg-db-directory-permissions (It \
  should be an UNIX permission mode in three-digit octal notation.)
 ERR_CONFIG_BACKEND_INSANE_MODE_568=Invalid UNIX file permissions %s \
-  does not allow read and write access to the backend database directory by \
-  the backend
+ does not allow read and write access to the backend database directory by \
+ the backend
 ERR_CONFIG_PWPOLICY_NO_DEFAULT_POLICY_571=No default password policy \
- is configured for the Directory Server.  The default password policy must be \
+ is configured for the Directory Server. The default password policy must be \
  specified by the ds-cfg-default-password-policy attribute in the cn=config \
  entry
 WARN_CONFIG_BACKEND_CANNOT_REGISTER_BACKEND_572=An error occurred \
- while attempting to register backend %s with the Directory Server:  %s
+ while attempting to register backend %s with the Directory Server: %s
 ERR_CONFIG_FILE_CANNOT_CREATE_ARCHIVE_DIR_NO_REASON_573=An error \
  occurred while trying to create the configuration archive directory %s
 ERR_CONFIG_FILE_CANNOT_CREATE_ARCHIVE_DIR_574=An error occurred while \
- trying to create the configuration archive directory %s:  %s
+ trying to create the configuration archive directory %s: %s
 ERR_CONFIG_FILE_CANNOT_WRITE_CONFIG_ARCHIVE_575=An error occurred \
  while trying to write the current configuration to the configuration archive: \
  %s
 ERR_CONFIG_GROUP_INITIALIZATION_FAILED_591=An error occurred while \
  trying to initialize an instance of class %s as a group implementation as in \
- configuration entry %s:  %s
+ configuration entry %s: %s
 ERR_CONFIG_FILE_ADD_INSUFFICIENT_PRIVILEGES_598=You do not have \
  sufficient privileges to perform add operations in the Directory Server \
  configuration
@@ -671,34 +671,34 @@
  sufficient privileges to change the set of default root privileges
 ERR_CONFIG_CERTMAPPER_INITIALIZATION_FAILED_614=An error occurred while \
  trying to initialize an instance of class %s as a certificate mapper as \
- defined in configuration entry %s:  %s
+ defined in configuration entry %s: %s
 ERR_CONFIG_KEYMANAGER_CANNOT_GET_BASE_617=An error occurred while \
  attempting to retrieve the key manager provider base entry cn=Key Manager \
- Providers,cn=config from the Directory Server configuration:  %s
+ Providers,cn=config from the Directory Server configuration: %s
 ERR_CONFIG_KEYMANAGER_INITIALIZATION_FAILED_627=An error occurred while \
  trying to initialize an instance of class %s as a key manager provider as \
- defined in configuration entry %s:  %s
+ defined in configuration entry %s: %s
 ERR_CONFIG_TRUSTMANAGER_CANNOT_GET_BASE_630=An error occurred while \
  attempting to retrieve the trust manager provider base entry cn=Trust Manager \
- Providers,cn=config from the Directory Server configuration:  %s
+ Providers,cn=config from the Directory Server configuration: %s
 ERR_CONFIG_TRUSTMANAGER_INITIALIZATION_FAILED_640=An error occurred \
  while trying to initialize an instance of class %s as a trust manager \
- provider as defined in configuration entry %s:  %s
+ provider as defined in configuration entry %s: %s
 ERR_CONFIG_JMX_CANNOT_GET_ATTRIBUTE_643=Unable to retrieve JMX \
- attribute %s associated with configuration entry %s:  %s
+ attribute %s associated with configuration entry %s: %s
 ERR_CONFIG_CHANGE_NO_RESULT_645=%s.%s returned a result of null for \
  entry %s
-ERR_CONFIG_CHANGE_RESULT_ERROR_646=%s.%s failed for entry %s:  result \
+ERR_CONFIG_CHANGE_RESULT_ERROR_646=%s.%s failed for entry %s: result \
  code=%s, admin action required=%b, messages="%s"
 WARN_CONFIG_CHANGE_RESULT_ACTION_REQUIRED_647=%s.%s indicated that \
- administrative action is required for entry %s:  messages="%s"
+ administrative action is required for entry %s: messages="%s"
 INFO_CONFIG_CHANGE_RESULT_MESSAGES_648=%s.%s succeeded but generated the \
- following messages for entry %s:  %s
+ following messages for entry %s: %s
 ERR_CONFIG_VATTR_INVALID_SEARCH_FILTER_649=Unable to parse value "%s" \
- from config entry "%s" as a valid search filter:  %s
+ from config entry "%s" as a valid search filter: %s
 ERR_CONFIG_VATTR_INITIALIZATION_FAILED_650=An error occurred while \
  trying to load an instance of class %s referenced in configuration entry %s \
- as a virtual attribute provider:  %s
+ as a virtual attribute provider: %s
 ERR_CONFIG_VATTR_SV_TYPE_WITH_MV_PROVIDER_651=The virtual attribute \
  configuration in entry "%s" is not valid because attribute type %s is \
  single-valued but provider %s may generate multiple values
@@ -710,52 +710,52 @@
  entry %s cannot be modified because the change would alter its structural \
  object class
 ERR_CONFIG_CANNOT_CALCULATE_DIGEST_654=An error occurred while \
- attempting to calculate a SHA-1 digest of file %s:  %s
+ attempting to calculate a SHA-1 digest of file %s: %s
 WARN_CONFIG_MANUAL_CHANGES_DETECTED_655=The Directory Server has \
  detected that one or more external changes have been made to the \
  configuration file %s while the server was online, but another change has \
- caused the server configuration to be overwritten.  The manual changes have \
+ caused the server configuration to be overwritten. The manual changes have \
  not been applied, but they have been preserved in file %s
 ERR_CONFIG_MANUAL_CHANGES_LOST_656=The Directory Server encountered an \
  error while attempting to determine whether the configuration file %s has \
  been externally edited with the server online, and/or trying to preserve such \
- changes:  %s.  Any manual changes made to that file may have been lost
+ changes: %s. Any manual changes made to that file may have been lost
 ERR_CONFIG_ROTATION_POLICY_INVALID_CLASS_657=Class %s specified in \
  attribute ds-cfg-java-class of configuration entry %s cannot be \
- instantiated as a Directory Server log rotation policy:  %s
+ instantiated as a Directory Server log rotation policy: %s
 ERR_CONFIG_RETENTION_POLICY_INVALID_CLASS_658=Class %s specified in \
  attribute ds-cfg-java-class of configuration entry %s cannot be \
- instantiated as a Directory Server log retention policy:  %s
+ instantiated as a Directory Server log retention policy: %s
 ERR_CONFIG_ROTATION_POLICY_CANNOT_CREATE_POLICY_659=An error occurred \
  while attempting to create a Directory Server log rotation policy from the \
- information in configuration entry %s:  %s
+ information in configuration entry %s: %s
 ERR_CONFIG_RETENTION_POLICY_CANNOT_CREATE_POLICY_660=An error occurred \
  while attempting to create a Directory Server log retention policy from the \
- information in configuration entry %s:  %s
+ information in configuration entry %s: %s
 ERR_CONFIG_LOGGING_CANNOT_CREATE_WRITER_661=An error occurred while \
  attempting to create a text writer for a Directory Server logger from the \
- information in configuration entry %s:  %s
+ information in configuration entry %s: %s
 WARN_CONFIG_SCHEMA_MULTIPLE_ENTRIES_IN_FILE_662=Schema configuration \
- file %s in directory %s contains more than one entry.  Only the first entry \
+ file %s in directory %s contains more than one entry. Only the first entry \
  will be examined, and the additional entries will be ignored
 WARN_CONFIG_SCHEMA_UNPARSEABLE_EXTRA_DATA_IN_FILE_663=Schema \
  configuration file %s in directory %s contains additional data after the \
- schema entry that cannot be parsed by the LDIF reader:  %s.  The first entry \
+ schema entry that cannot be parsed by the LDIF reader: %s. The first entry \
  will be processed, but the remaining data will be ignored
 WARN_CONFIG_PLUGIN_EMPTY_ELEMENT_IN_ORDER_664=The plugin order \
- definition for plugins of type %s contains an empty element.  This may cause \
+ definition for plugins of type %s contains an empty element. This may cause \
  the plugin order to be evaluated incorrectly
 WARN_CONFIG_PLUGIN_MULTIPLE_WILDCARDS_IN_ORDER_665=The plugin order \
- definition for plugins of type %s contains multiple wildcard characters.  All \
+ definition for plugins of type %s contains multiple wildcard characters. All \
  plugin definitions should contain exactly one wildcard element to indicate \
  where unmatched plugins should be included in the order, and including \
  multiple wildcards may cause the plugin order to be evaluated incorrectly
 WARN_CONFIG_PLUGIN_LISTED_MULTIPLE_TIMES_666=The plugin order \
  definition for plugins of type %s includes multiple references to the '%s' \
- plugin.  This may cause the plugin order to be evaluated incorrectly
+ plugin. This may cause the plugin order to be evaluated incorrectly
 WARN_CONFIG_PLUGIN_ORDER_NO_WILDCARD_667=The plugin order definition \
  for plugins of type %s does not include a wildcard element to indicate where \
- unmatched plugins should be included in the order.  The server will default \
+ unmatched plugins should be included in the order. The server will default \
  to invoking all unnamed plugins after set of named plugins
 WARN_CONFIG_SCHEMA_CANNOT_DELETE_SYNTAX_IN_USE_668=Attribute syntax %s \
  cannot be deleted from the server because it is in use by attribute type %s
@@ -772,37 +772,37 @@
  %s cannot be disabled because it is in use by matching rule use %s
 ERR_CONFIG_WORK_QUEUE_INITIALIZATION_FAILED_674=Unable to initialize \
  an instance of class %s as a work queue as specified in configuration entry \
- %s:  %s
+ %s: %s
 INFO_CONFIG_WORK_QUEUE_CLASS_CHANGE_REQUIRES_RESTART_675=The class used to \
  provide the Directory Server work queue implementation has been changed from \
  %s to %s, but this change will not take effect until the server is restarted
 ERR_CONFIG_FILE_ADD_APPLY_FAILED_676=The attempt to apply the \
- configuration add failed.  The preliminary checks were all successful and the \
+ configuration add failed. The preliminary checks were all successful and the \
  entry was added to the server configuration, but at least one of the \
  configuration add listeners reported an error when attempting to apply the \
- change:  %s
+ change: %s
 ERR_CONFIG_FILE_DELETE_APPLY_FAILED_677=The attempt to apply the \
- configuration delete failed.  The preliminary checks were all successful and \
+ configuration delete failed. The preliminary checks were all successful and \
  the entry was removed from the server configuration, but at least one of the \
  configuration delete listeners reported an error when attempting to apply the \
- change:  %s
+ change: %s
 ERR_CONFIG_FILE_MODIFY_APPLY_FAILED_678=The attempt to apply the \
- configuration modification failed.  The preliminary checks were all \
+ configuration modification failed. The preliminary checks were all \
  successful and the modified entry was written to the server configuration, \
  but at least one of the configuration change listeners reported an error when \
- attempting to apply the change:  %s
+ attempting to apply the change: %s
 ERR_CONFIG_KEYMANAGER_CONFIG_NOT_ACCEPTABLE_679=The configuration for \
  the key manager provider defined in configuration entry %s was not \
- acceptable:  %s
+ acceptable: %s
 ERR_CONFIG_TRUSTMANAGER_CONFIG_NOT_ACCEPTABLE_680=The configuration for \
  the trust manager provider defined in configuration entry %s was not \
- acceptable:  %s
+ acceptable: %s
 ERR_CONFIG_AUTHZ_CONFIG_NOT_ACCEPTABLE_681=The configuration for the \
  trust manager provider defined in configuration entry %s was not acceptable: \
  %s
 ERR_CONFIG_ACCTNOTHANDLER_CONFIG_NOT_ACCEPTABLE_682=The configuration \
  for the account status notification handler defined in configuration entry %s \
- was not acceptable:  %s
+ was not acceptable: %s
 ERR_CONFIG_SCHEMA_SYNTAX_CONFIG_NOT_ACCEPTABLE_683=The configuration for \
  the attribute syntax defined in configuration entry %s was not acceptable: \
  %s
@@ -813,9 +813,9 @@
  group implementation defined in configuration entry %s was not acceptable: \
  %s
 ERR_CONFIG_IDMAPPER_CONFIG_NOT_ACCEPTABLE_687=The configuration for the \
- identity mapper defined in configuration entry %s was not acceptable:  %s
+ identity mapper defined in configuration entry %s was not acceptable: %s
 ERR_CONFIG_SCHEMA_MR_CONFIG_NOT_ACCEPTABLE_688=The configuration for the \
- matching rule defined in configuration entry %s was not acceptable:  %s
+ matching rule defined in configuration entry %s was not acceptable: %s
 ERR_CONFIG_PWGENERATOR_CONFIG_NOT_ACCEPTABLE_689=The configuration for \
  the password generator defined in configuration entry %s was not acceptable: \
  %s
@@ -826,40 +826,40 @@
  the password validator defined in configuration entry %s was not acceptable: \
  %s
 ERR_CONFIG_PLUGIN_CONFIG_NOT_ACCEPTABLE_692=The configuration for the \
- plugin defined in configuration entry %s was not acceptable:  %s
+ plugin defined in configuration entry %s was not acceptable: %s
 ERR_CONFIG_SASL_CONFIG_NOT_ACCEPTABLE_693=The configuration for the SASL \
- mechanism handler defined in configuration entry %s was not acceptable:  %s
+ mechanism handler defined in configuration entry %s was not acceptable: %s
 ERR_CONFIG_VATTR_CONFIG_NOT_ACCEPTABLE_694=The configuration for the \
  virtual attribute provider defined in configuration entry %s was not \
- acceptable:  %s
+ acceptable: %s
 ERR_CONFIG_ALERTHANDLER_CONFIG_NOT_ACCEPTABLE_695=The configuration for \
- the alert handler defined in configuration entry %s was not acceptable:  %s
+ the alert handler defined in configuration entry %s was not acceptable: %s
 ERR_CONFIG_ALERTHANDLER_INITIALIZATION_FAILED_696=An error occurred \
  while trying to initialize an instance of class %s as an alert handler as \
- defined in configuration entry %s:  %s
+ defined in configuration entry %s: %s
 ERR_CONFIG_CORE_INVALID_SMTP_SERVER_697=The provided SMTP server value \
- '%s' is invalid.  An SMTP server value must have an IP address or a \
+ '%s' is invalid. An SMTP server value must have an IP address or a \
  resolvable name, and it may optionally be followed by a colon and an integer \
  value between 1 and 65535 to specify the server port number
 ERR_STARTOK_CANNOT_OPEN_FOR_READING_698=An error occurred while \
  attempting to open the current configuration file %s for reading in order to \
- copy it to the ".startok" file:  %s
+ copy it to the ".startok" file: %s
 ERR_STARTOK_CANNOT_OPEN_FOR_WRITING_699=An error occurred while \
  attempting to open file %s in order to write the ".startok" configuration \
- file:  %s
+ file: %s
 ERR_STARTOK_CANNOT_WRITE_700=An error occurred while attempting to \
  copy the current configuration from file %s into temporary file %s for use \
- as the ".startok" configuration file:  %s
+ as the ".startok" configuration file: %s
 ERR_STARTOK_CANNOT_RENAME_701=An error occurred while attempting to \
- rename file %s to %s for use as the ".startok" configuration file:  %s
+ rename file %s to %s for use as the ".startok" configuration file: %s
 NOTE_CONFIG_FILE_USING_STARTOK_FILE_702=The Directory Server is starting \
  using the last known good configuration file %s rather than the active \
  configuration file %s
 WARN_CONFIG_FILE_NO_STARTOK_FILE_703=No last known good configuration \
- file %s exists.  The server will attempt to start using the active \
+ file %s exists. The server will attempt to start using the active \
  configuration file %s
 ERR_CONFIG_JE_PROPERTY_INVALID_704=An error occurred while \
- trying to parse and validate Berkeley DB JE property %s:  %s
+ trying to parse and validate Berkeley DB JE property %s: %s
 ERR_CONFIG_JE_PROPERTY_INVALID_FORM_705=An error occurred while \
  trying to parse and validate Berkeley DB JE property %s: the property \
  does not follow a singular property=value form
@@ -872,19 +872,19 @@
 INFO_CONFIG_JE_PROPERTY_REQUIRES_RESTART_708=Setting Berkeley DB JE property \
  %s will not take effect until the component for which it is set is restarted
 ERR_CONFIG_LOGGING_CANNOT_OPEN_FILE_709=An error occurred while \
- attempting to open the configured log file %s for logger %s:  %s
+ attempting to open the configured log file %s for logger %s: %s
 ERR_CONFIG_WORKFLOW_ELEMENT_CONFIG_NOT_ACCEPTABLE_710=The configuration \
  for the workflow element defined in configuration entry %s was not \
  acceptable: %s
 ERR_CONFIG_WORKFLOW_ELEMENT_CANNOT_INITIALIZE_711=An error occurred \
  while trying to initialize a workflow element from class %s with the \
- information in configuration entry %s:  %s.  This workflow element will be \
+ information in configuration entry %s: %s. This workflow element will be \
  disabled
 ERR_CONFIG_WORKFLOW_CANNOT_CONFIGURE_MANUAL_713=An error occurred \
  while trying to configure in manual mode the workflows in the \
  Directory Server, and rollback to automatic configuration mode has failed \
  too. If the server is in an unstab\
-  le state restart it with the last \
+ le state restart it with the last \
  valid configuration
 ERR_CONFIG_WORKFLOW_CANNOT_CONFIGURE_AUTO_714=An error occurred \
  while trying to configure in automatic mode the workflows in the \
@@ -892,14 +892,14 @@
  too. If the server is in an unstable state restart it with the last \
  valid configuration
 ERR_CONFIG_LOGGING_INSANE_MODE_715=Invalid UNIX file permissions %s \
-  does not allow write access to the log file by the log publisher
+ does not allow write access to the log file by the log publisher
 ERR_CONFIG_LOGGING_MODE_INVALID_716=Invalid UNIX file permissions %s: %s
 ERR_CONFIG_EXTENSION_CONFIG_NOT_ACCEPTABLE_717=The configuration for \
  the extension defined in configuration entry %s was not \
- acceptable:  %s
+ acceptable: %s
 ERR_CONFIG_EXTENSION_INITIALIZATION_FAILED_718=An error occurred while \
  trying to initialize an instance of class %s as an extension as \
- defined in configuration entry %s:  %s
+ defined in configuration entry %s: %s
 ERR_CONFIG_NETWORKGROUPREQUESTFILTERINGPOLICY_INVALID_ATTRIBUTE_719=The \
  allowed attribute %s specified in configuration entry %s is also defined as \
  a prohibited attribute
@@ -907,15 +907,15 @@
  allowed subtree %s specified in configuration entry %s is also defined as \
  a prohibited subtree
 ERR_CONFIG_NETWORK_GROUP_CONFIG_NOT_ACCEPTABLE_721=The configuration \
- for the network group defined in configuration entry %s was not acceptable:  %s
+ for the network group defined in configuration entry %s was not acceptable: %s
 ERR_CONFIG_NETWORK_GROUP_POLICY_CANNOT_INITIALIZE_722=An error occurred \
  while trying to initialize a network group policy loaded from class %s with \
- the information in configuration entry %s:  %s
+ the information in configuration entry %s: %s
 WARN_CONFIG_SCHEMA_CANNOT_PARSE_LDAP_SYNTAX_723=An ldapSyntaxes \
-  attribute read from schema configuration file %s could not be parsed:  %s
+ attribute read from schema configuration file %s could not be parsed: %s
 WARN_CONFIG_SCHEMA_CONFLICTING_LDAP_SYNTAX_724=An ldap syntax read \
  from schema configuration file %s conflicts with another ldap syntax already \
- read into the schema:  %s.  The later ldap syntax description will be used
+ read into the schema: %s. The later ldap syntax description will be used
 ERR_CONFIG_PWPOLICY_DEFAULT_POLICY_IS_WRONG_TYPE_726=The configuration \
  entry '%s' is currently defined to be the default password policy, however it \
  is not a password policy
@@ -923,7 +923,7 @@
  default password policy value '%s' is invalid because it refers to an \
  authentication policy which is not a password policy
 ERR_CONFIG_LOGGING_INVALID_TIME_FORMAT_728=The timestamp format string \
- "%s" is not a valid format string.  The format string should conform to the \
+ "%s" is not a valid format string. The format string should conform to the \
  syntax described in the documentation for the "java.text.SimpleDateFormat" class
 ERR_CONFIG_LOGGING_INVALID_USER_DN_PATTERN_729=The access log filtering \
  criteria defined in "%s" could not be parsed because it contains an invalid \
@@ -932,11 +932,11 @@
  criteria defined in "%s" could not be parsed because it contains an invalid \
  target DN pattern "%s"
 WARN_CONFIG_LOGGER_NO_ACTIVE_HTTP_ACCESS_LOGGERS_731=There are no active \
- HTTP access loggers defined in the Directory Server configuration.  No HTTP \
+ HTTP access loggers defined in the Directory Server configuration. No HTTP \
  access logging will be performed
 ERR_CONFIG_LOGGER_INVALID_HTTP_ACCESS_LOGGER_CLASS_732=Class %s specified \
  in attribute ds-cfg-java-class of configuration entry %s cannot be \
- instantiated as a Directory Server HTTP access logger:  %s
+ instantiated as a Directory Server HTTP access logger: %s
 ERR_CONFIG_LOGGING_EMPTY_LOG_FORMAT_733=The log format for configuration \
  entry %s is empty. No information will be logged even if logging is activated
 WARN_CONFIG_LOGGING_UNSUPPORTED_FIELDS_IN_LOG_FORMAT_734=The log format \
diff --git a/opendj3-server-dev/src/messages/messages/core.properties b/opendj3-server-dev/src/messages/messages/core.properties
index e71e374..c68a6ec 100644
--- a/opendj3-server-dev/src/messages/messages/core.properties
+++ b/opendj3-server-dev/src/messages/messages/core.properties
@@ -111,9 +111,9 @@
 INFO_CANCELED_BY_SHUTDOWN_107=Processing on this operation has been canceled \
  because the Directory Server is shutting down
 ERR_UNCAUGHT_WORKER_THREAD_EXCEPTION_108=%s encountered an uncaught \
- exception while processing operation %s:  %s
+ exception while processing operation %s: %s
 WARN_UNEXPECTED_WORKER_THREAD_EXIT_109=%s is unexpectedly exiting when \
- the Directory Server is not in the process of shutting down.  This likely \
+ the Directory Server is not in the process of shutting down. This likely \
  indicates that the thread encountered an unexpected error
 WARN_OP_REJECTED_BY_SHUTDOWN_111=The request to process this operation \
  has been rejected because the Directory Server has already started its \
@@ -122,32 +122,32 @@
  operation has been rejected because the work queue has already reached its \
  maximum capacity of %d pending operations
 WARN_WORKER_INTERRUPTED_WITHOUT_SHUTDOWN_113=%s was interrupted while \
- waiting for new work:  %s.  This should not happen, but the thread will \
+ waiting for new work: %s. This should not happen, but the thread will \
  resume waiting for new work so there should be no adverse effects
 WARN_WORKER_WAITING_UNCAUGHT_EXCEPTION_114=An unexpected exception was \
- caught while %s was waiting for new work:  %s.  This should not happen, but \
+ caught while %s was waiting for new work: %s. This should not happen, but \
  the thread will resume waiting for new work so there should be no adverse \
  effects
 WARN_QUEUE_UNABLE_TO_CANCEL_115=The work queue caught an exception while \
  trying to cancel pending operation %s when the Directory Server was shutting \
- down:  %s
+ down: %s
 WARN_QUEUE_UNABLE_TO_NOTIFY_THREAD_116=The work queue caught an \
  exception while trying to notify %s that the Directory Server was shutting \
- down:  %s
+ down: %s
 INFO_DISCONNECT_DUE_TO_SERVER_ERROR_117=Server Error
 ERR_CANNOT_BOOTSTRAP_WHILE_RUNNING_118=The Directory Server is \
- currently running.  The configuration may not be bootstrapped while the \
+ currently running. The configuration may not be bootstrapped while the \
  server is online
 ERR_CANNOT_LOAD_CONFIG_HANDLER_CLASS_119=Unable to load class %s to \
- serve as the Directory Server configuration handler:  %s
+ serve as the Directory Server configuration handler: %s
 ERR_CANNOT_INSTANTIATE_CONFIG_HANDLER_120=Unable to create an instance \
  of class %s to serve as the Directory Server configuration handler: %s
 ERR_CANNOT_INITIALIZE_CONFIG_HANDLER_121=An error occurred while trying \
- to initialize the configuration handler %s using configuration file %s:  %s
+ to initialize the configuration handler %s using configuration file %s: %s
 ERR_CANNOT_START_BEFORE_BOOTSTRAP_122=The Directory Server may not be \
  started before the configuration has been bootstrapped
 ERR_CANNOT_START_WHILE_RUNNING_123=The Directory Server may not be \
- started while it is already running.   Please stop the running instance \
+ started while it is already running.  Please stop the running instance \
  before attempting to start it again
 ERR_ATTR_TYPE_NORMALIZE_NO_MR_125=Unable to normalize value %s for \
  attribute type %s because no equality matching rule is defined for that \
@@ -159,9 +159,9 @@
  Directory Server schema configuration because it includes attribute %s which \
  is not allowed by any of the objectclasses defined in that entry
 ERR_CANNOT_BOOTSTRAP_MATCHING_RULE_129=An error occurred while \
- attempting to bootstrap the matching rule defined in class %s:  %s
+ attempting to bootstrap the matching rule defined in class %s: %s
 ERR_CANNOT_BOOTSTRAP_SYNTAX_130=An error occurred while attempting to \
- bootstrap the attribute syntax defined in class %s:  %s
+ bootstrap the attribute syntax defined in class %s: %s
 INFO_DIRECTORY_BOOTSTRAPPING_132=The Directory Server is beginning the \
  configuration bootstrapping process
 NOTE_DIRECTORY_SERVER_STARTING_134=%s (build %s, R%d) starting up
@@ -169,22 +169,22 @@
  successfully
 ERR_CANNOT_CREATE_MBEAN_SERVER_138=An error occurred while attempting \
  to create the JMX MBean server that will be used for monitoring, \
- notification, and configuration interaction within the Directory Server:  %s
+ notification, and configuration interaction within the Directory Server: %s
 NOTE_SENT_ALERT_NOTIFICATION_139=The Directory Server has sent an alert \
- notification generated by class %s (alert type %s, alert ID %s):  %s
+ notification generated by class %s (alert type %s, alert ID %s): %s
 ERR_UNCAUGHT_THREAD_EXCEPTION_140=An uncaught exception during \
- processing for thread %s has caused it to terminate abnormally.  The stack \
- trace for that exception is:  %s
+ processing for thread %s has caused it to terminate abnormally. The stack \
+ trace for that exception is: %s
 NOTE_SERVER_SHUTDOWN_141=The Directory Server has started the shutdown \
- process.  The shutdown was initiated by an instance of class %s and the \
+ process. The shutdown was initiated by an instance of class %s and the \
  reason provided for the shutdown was %s
 ERR_SHUTDOWN_DUE_TO_SHUTDOWN_HOOK_142=The Directory Server shutdown \
- hook detected that the JVM is shutting down.  This generally indicates that \
+ hook detected that the JVM is shutting down. This generally indicates that \
  JVM received an external request to stop (e.g., through a kill signal)
 ERR_SEARCH_FILTER_NULL_143=Unable to decode the provided filter string \
  as a search filter because the provided string was empty or null
 ERR_SEARCH_FILTER_UNCAUGHT_EXCEPTION_144=An unexpected error occurred \
- while attempting to decode the string "%s" as a search filter:  %s
+ while attempting to decode the string "%s" as a search filter: %s
 ERR_SEARCH_FILTER_MISMATCHED_PARENTHESES_145=The provided search filter \
  "%s" had mismatched parentheses around the portion between positions %d and \
  %d
@@ -192,7 +192,7 @@
  missing an equal sign in the suspected simple filter component between \
  positions %d and %d
 ERR_SEARCH_FILTER_INVALID_ESCAPED_BYTE_147=The provided search filter \
- "%s" had an invalid escaped byte value at position %d.  A backslash in a \
+ "%s" had an invalid escaped byte value at position %d. A backslash in a \
  value must be followed by two hexadecimal characters that define the byte \
  that has been encoded
 ERR_SEARCH_FILTER_COMPOUND_MISSING_PARENTHESES_148=The provided search \
@@ -283,7 +283,7 @@
  position %d, where either the end of the string or a '+' sign were expected
 ERR_CANNOT_GET_ROOT_DSE_CONFIG_ENTRY_183=An error occurred while \
  trying to retrieve the root DSE configuration entry (cn=Root DSE,cn=config) \
- from the Directory Server configuration:  %s
+ from the Directory Server configuration: %s
 ERR_SCHEMA_CONFLICTING_ATTRIBUTE_OID_184=Unable to register attribute \
  type %s with the server schema because its OID %s conflicts with the OID of \
  an existing attribute type %s
@@ -328,13 +328,13 @@
  existing name form %s
 ERR_ENTRY_SCHEMA_MULTIPLE_STRUCTURAL_CLASSES_198=Entry %s violates the \
  Directory Server schema configuration because it includes multiple \
- conflicting structural objectclasses %s and %s.  Only a single structural \
+ conflicting structural objectclasses %s and %s. Only a single structural \
  objectclass is allowed in an entry
 ERR_ENTRY_SCHEMA_NO_STRUCTURAL_CLASS_199=Entry %s violates the Directory \
  Server schema configuration because it does not include a structural \
- objectclass.  All entries must contain a structural objectclass
+ objectclass. All entries must contain a structural objectclass
 WARN_ADD_OP_INVALID_SYNTAX_200=Entry "%s" contains a value "%s" for \
- attribute %s that is invalid according to the syntax for that attribute:  %s
+ attribute %s that is invalid according to the syntax for that attribute: %s
 WARN_COMPARE_OP_NO_SUCH_ATTR_201=Entry "%s" does not contain any \
  values for attribute "%s"
 WARN_COMPARE_OP_NO_SUCH_ATTR_WITH_OPTIONS_202=Entry "%s" does not \
@@ -376,7 +376,7 @@
  Directory Server schema configuration because DIT structure rule %s does not \
  allow entries of type %s to be placed immediately below entries of type %s
 ERR_ENTRY_SCHEMA_COULD_NOT_CHECK_DSR_216=An unexpected error occurred \
- while attempting to check entry %s against DIT structure rule %s:  %s
+ while attempting to check entry %s against DIT structure rule %s: %s
 INFO_CANCELED_BY_BIND_REQUEST_217=Processing on this operation has been \
  canceled because the Directory Server received a bind request on this \
  connection, which requires that all operations in progress to be abandoned
@@ -385,7 +385,7 @@
 ERR_BIND_OPERATION_CANNOT_LOCK_USER_219=Unable to process the bind \
  because the server was unable to obtain a read lock on the entry %s
 ERR_STARTUP_PLUGIN_ERROR_220=A fatal error occurred when executing one \
- of the Directory Server startup plugins:  %s (error ID %d).  The Directory \
+ of the Directory Server startup plugins: %s (error ID %d). The Directory \
  Server startup process has been aborted
 ERR_BIND_OPERATION_NO_PASSWORD_221=Unable to bind to the Directory \
  Server using simple authentication because that user does not have a password
@@ -397,14 +397,14 @@
  This could mean that the target operation has already completed or was never \
  requested
 ERR_COMPARE_CANNOT_LOCK_ENTRY_227=The Directory Server was unable to \
- obtain a read lock on entry %s after multiple attempts.  Processing on this \
+ obtain a read lock on entry %s after multiple attempts. Processing on this \
  operation cannot continue
 ERR_COMPARE_NO_SUCH_ENTRY_228=The specified entry %s does not exist in \
  the Directory Server
 INFO_CANCELED_BY_ABANDON_REQUEST_229=The operation was canceled because the \
  client issued an abandon request (message ID %d) for this operation
 ERR_ADD_CANNOT_ADD_ROOT_DSE_230=The provided entry cannot be added \
- because it contains a null DN.  This DN is reserved for the root DSE, and \
+ because it contains a null DN. This DN is reserved for the root DSE, and \
  that entry may not be added over protocol
 ERR_ADD_ENTRY_NOT_SUFFIX_231=The provided entry %s cannot be added \
  because it does not have a parent and is not defined as one of the suffixes \
@@ -440,14 +440,14 @@
  %s
 ERR_MODDN_DIFFERENT_BACKENDS_246=The modify DN operation for entry %s \
  cannot be performed because the backend holding the current entry is \
- different from the backend used to handle the new DN %s.  Modify DN \
+ different from the backend used to handle the new DN %s. Modify DN \
  operations may not span multiple backends
 ERR_MODDN_CANNOT_LOCK_CURRENT_DN_247=The modify DN operation for entry \
  %s cannot be performed because the server was unable to obtain a write lock \
  for that DN
 ERR_MODDN_EXCEPTION_LOCKING_NEW_DN_248=The modify DN operation for \
  entry %s cannot be performed because an exception was caught while attempting \
- to obtain a write lock for new DN %s:  %s
+ to obtain a write lock for new DN %s: %s
 ERR_MODDN_CANNOT_LOCK_NEW_DN_249=The modify DN operation for entry %s \
  cannot be performed because the server was unable to obtain a write lock for \
  the new DN %s
@@ -463,20 +463,20 @@
  provided
 ERR_MODIFY_ADD_INVALID_SYNTAX_254=When attempting to modify entry %s to \
  add one or more values for attribute %s, value "%s" was found to be invalid \
- according to the associated syntax:  %s
+ according to the associated syntax: %s
 ERR_MODIFY_ADD_DUPLICATE_VALUE_255=Entry %s cannot be modified because \
- it would have resulted in one or more duplicate values for attribute %s:  %s
+ it would have resulted in one or more duplicate values for attribute %s: %s
 ERR_MODIFY_DELETE_RDN_ATTR_256=Entry %s cannot be modified because the \
  change to attribute %s would have removed a value used in the RDN
 ERR_MODIFY_DELETE_MISSING_VALUES_257=Entry %s cannot be modified because \
  the attempt to update attribute %s would have removed one or more values from \
- the attribute that were not present:  %s
+ the attribute that were not present: %s
 ERR_MODIFY_DELETE_NO_SUCH_ATTR_258=Entry %s cannot be modified because \
  an attempt was made to remove one or more values from attribute %s but this \
  attribute is not present in the entry
 ERR_MODIFY_REPLACE_INVALID_SYNTAX_259=When attempting to modify entry %s \
  to replace the set of values for attribute %s, value "%s" was found to be \
- invalid according to the associated syntax:  %s
+ invalid according to the associated syntax: %s
 ERR_MODIFY_INCREMENT_RDN_260=Entry %s cannot be modified because an \
  attempt was made to increment the value of attribute %s which is used as an \
  RDN attribute for the entry
@@ -498,7 +498,7 @@
  modified because an attempt was made to increment the value of attribute %s \
  but the value "%s" could not be parsed as an integer
 ERR_MODIFY_VIOLATES_SCHEMA_266=Entry %s cannot be modified because \
- the resulting entry would have violated the server schema:  %s
+ the resulting entry would have violated the server schema: %s
 ERR_MODIFY_NO_BACKEND_FOR_ENTRY_267=Entry %s cannot be modified because \
  there is no backend registered to handle operations for that entry
 ERR_EXTENDED_NO_HANDLER_268=There is no extended operation handler \
@@ -507,7 +507,7 @@
 ERR_ENTRY_SCHEMA_UNKNOWN_OC_269=Entry %s violates the Directory Server \
  schema configuration because it contains an unknown objectclass %s
 ERR_SEARCH_BACKEND_EXCEPTION_270=An unexpected error was encountered \
- while processing a search in one of the Directory Server backends:  %s
+ while processing a search in one of the Directory Server backends: %s
 ERR_MODDN_VIOLATES_SCHEMA_271=The modify DN operation for entry %s \
  cannot be performed because the change would have violated the server schema: \
  %s
@@ -532,13 +532,13 @@
 INFO_DSCORE_DESCRIPTION_SYSINFO_285=Display general system information
 INFO_DSCORE_DESCRIPTION_USAGE_287=Display this usage information
 ERR_DSCORE_CANNOT_INITIALIZE_ARGS_288=An error occurred while \
- attempting to initialize the command-line arguments:  %s
+ attempting to initialize the command-line arguments: %s
 ERR_DSCORE_ERROR_PARSING_ARGS_289=An error occurred while attempting to \
- parse the provided set of command line arguments:  %s
+ parse the provided set of command line arguments: %s
 ERR_DSCORE_CANNOT_BOOTSTRAP_290=An error occurred while attempting to \
- bootstrap the Directory Server:  %s
+ bootstrap the Directory Server: %s
 ERR_DSCORE_CANNOT_START_291=An error occurred while trying to start the \
- Directory Server:  %s
+ Directory Server: %s
 ERR_BACKUPINFO_NO_DELIMITER_292=The line "%s" associated with the \
  backup information in directory %s could not be parsed because it did not \
  contain an equal sign to delimit the property name from the value
@@ -552,7 +552,7 @@
  in directory %s could not be parsed because it contained an unknown property \
  %s with value %s
 ERR_BACKUPINFO_CANNOT_DECODE_296=An unexpected error occurred while \
- trying to decode a backup information structure in directory %s:  %s
+ trying to decode a backup information structure in directory %s: %s
 ERR_BACKUPINFO_NO_BACKUP_ID_297=Unable to decode a backup information \
  structure in directory %s because the structure did not include a backup ID
 ERR_BACKUPINFO_NO_BACKUP_DATE_298=The backup information structure \
@@ -565,19 +565,19 @@
 ERR_BACKUPDIRECTORY_UNRESOLVED_DEPENDENCY_301=Cannot remove backup %s \
  from backup directory %s because it is listed as a dependency for backup %s
 ERR_BACKUPDIRECTORY_CANNOT_CREATE_DIRECTORY_302=Backup directory %s \
- does not exist and an error occurred while attempting to create it:  %s
+ does not exist and an error occurred while attempting to create it: %s
 ERR_BACKUPDIRECTORY_NOT_DIRECTORY_303=The backup directory path %s \
  exists but does not reference a directory
 ERR_BACKUPDIRECTORY_CANNOT_DELETE_SAVED_DESCRIPTOR_304=An error \
- occurred while trying to remove saved backup descriptor file %s:  %s.  The \
+ occurred while trying to remove saved backup descriptor file %s: %s. The \
  new backup descriptor has been written to %s but will not be used until it is \
  manually renamed to %s
 ERR_BACKUPDIRECTORY_CANNOT_RENAME_CURRENT_DESCRIPTOR_305=An error \
  occurred while trying to rename the current backup descriptor file %s to %s: \
- %s.  The new backup descriptor has been written to %s but will not be used \
+ %s. The new backup descriptor has been written to %s but will not be used \
  until it is manually renamed to %s
 ERR_BACKUPDIRECTORY_CANNOT_RENAME_NEW_DESCRIPTOR_306=An error occurred \
- while trying to rename the new backup descriptor file %s to %s:  %s.  The new \
+ while trying to rename the new backup descriptor file %s to %s: %s. The new \
  backup descriptor will not be used until it is manually renamed
 ERR_BACKUPDIRECTORY_NO_DESCRIPTOR_FILE_307=No backup directory \
  descriptor file was found at %s
@@ -589,19 +589,19 @@
  backend configuration entry was expected
 ERR_BACKUPDIRECTORY_CANNOT_DECODE_DN_310=An error occurred while \
  trying to decode the value "%s" read from the first line of %s as the DN of \
- the backend configuration entry:  %s
+ the backend configuration entry: %s
 ERR_FILELOCKER_LOCK_SHARED_REJECTED_BY_EXCLUSIVE_311=The attempt to \
  obtain a shared lock on file %s was rejected because an exclusive lock was \
  already held on that file
 ERR_FILELOCKER_LOCK_SHARED_FAILED_CREATE_312=The attempt to obtain a \
  shared lock on file %s was rejected because the attempt to create the lock \
- file failed:  %s
+ file failed: %s
 ERR_FILELOCKER_LOCK_SHARED_FAILED_OPEN_313=The attempt to obtain a \
  shared lock on file %s was rejected because the attempt to open the lock file \
- failed:  %s
+ failed: %s
 ERR_FILELOCKER_LOCK_SHARED_FAILED_LOCK_314=The attempt to obtain a \
  shared lock on file %s was rejected because an error occurred while \
- attempting to acquire the lock:  %s
+ attempting to acquire the lock: %s
 ERR_FILELOCKER_LOCK_SHARED_NOT_GRANTED_315=The shared lock requested for \
  file %s was not granted, which indicates that another process already holds \
  an exclusive lock on that file
@@ -613,20 +613,20 @@
  already held on that file
 ERR_FILELOCKER_LOCK_EXCLUSIVE_FAILED_CREATE_318=The attempt to obtain an \
  exclusive lock on file %s was rejected because the attempt to create the lock \
- file failed:  %s
+ file failed: %s
 ERR_FILELOCKER_LOCK_EXCLUSIVE_FAILED_OPEN_319=The attempt to obtain an \
  exclusive lock on file %s was rejected because the attempt to open the lock \
- file failed:  %s
+ file failed: %s
 ERR_FILELOCKER_LOCK_EXCLUSIVE_FAILED_LOCK_320=The attempt to obtain an \
  exclusive lock on file %s was rejected because an error occurred while \
- attempting to acquire the lock:  %s
+ attempting to acquire the lock: %s
 ERR_FILELOCKER_LOCK_EXCLUSIVE_NOT_GRANTED_321=The exclusive lock \
  requested for file %s was not granted, which indicates that another process \
  already holds a shared or exclusive lock on that file
 ERR_FILELOCKER_UNLOCK_EXCLUSIVE_FAILED_RELEASE_322=The attempt to \
- release the exclusive lock held on %s failed:  %s
+ release the exclusive lock held on %s failed: %s
 ERR_FILELOCKER_UNLOCK_SHARED_FAILED_RELEASE_323=The attempt to release \
- the shared lock held on %s failed:  %s
+ the shared lock held on %s failed: %s
 ERR_FILELOCKER_UNLOCK_UNKNOWN_FILE_324=The attempt to release the lock \
  held on %s failed because no record of a lock on that file was found
 INFO_RESULT_CLIENT_SIDE_SERVER_DOWN_325=Server Connection Closed
@@ -648,11 +648,11 @@
 INFO_RESULT_CLIENT_SIDE_REFERRAL_LIMIT_EXCEEDED_341=Referral Hop Limit \
  Exceeded
 WARN_SHUTDOWN_CANNOT_RELEASE_SHARED_BACKEND_LOCK_342=An error occurred \
- while attempting to release a shared lock for backend %s:  %s.  This lock \
+ while attempting to release a shared lock for backend %s: %s. This lock \
  should be automatically cleaned when the Directory Server process exits, so \
  no additional action should be necessary
 ERR_CANNOT_ACQUIRE_EXCLUSIVE_SERVER_LOCK_343=The Directory Server could \
- not acquire an exclusive lock on file %s:  %s.  This generally means that \
+ not acquire an exclusive lock on file %s: %s. This generally means that \
  another instance of this server is already running
 ERR_MODIFY_ATTR_IS_NO_USER_MOD_346=Entry %s cannot be modified because \
  the modification attempted to update attribute %s which is defined as \
@@ -670,14 +670,14 @@
  attribute is not already included in the entry
 ERR_MODDN_PREOP_VIOLATES_SCHEMA_356=The modify DN operation for entry %s \
  cannot be performed because a pre-operation plugin modified the entry in a \
- way that caused it to violate the server schema:  %s
+ way that caused it to violate the server schema: %s
 ERR_MODIFY_ASSERTION_FAILED_357=Entry %s cannot be modified because the \
  request contained an LDAP assertion control and the associated filter did not \
  match the contents of the entry
 ERR_MODIFY_CANNOT_PROCESS_ASSERTION_FILTER_358=Entry %s cannot be \
  modified because the request contained an LDAP assertion control, but an \
  error occurred while attempting to compare the target entry against the \
- filter contained in the control:  %s
+ filter contained in the control: %s
 ERR_MODIFY_UNSUPPORTED_CRITICAL_CONTROL_359=Entry %s cannot be modified \
  because the request contained a critical control with OID %s that is not \
  supported by the Directory Server for this type of operation
@@ -687,7 +687,7 @@
 ERR_DELETE_CANNOT_PROCESS_ASSERTION_FILTER_363=Entry %s cannot be \
  removed because the request contained an LDAP assertion control, but an error \
  occurred while attempting to compare the target entry against the filter \
- contained in the control:  %s
+ contained in the control: %s
 ERR_DELETE_UNSUPPORTED_CRITICAL_CONTROL_364=Entry %s cannot be removed \
  because the request contained a critical control with OID %s that is not \
  supported by the Directory Server for this type of operation
@@ -697,7 +697,7 @@
 ERR_MODDN_CANNOT_PROCESS_ASSERTION_FILTER_366=Entry %s cannot be renamed \
  because the request contained an LDAP assertion control, but an error \
  occurred while attempting to compare the target entry against the filter \
- contained in the control:  %s
+ contained in the control: %s
 ERR_MODDN_UNSUPPORTED_CRITICAL_CONTROL_367=Entry %s cannot be renamed \
  because the request contained a critical control with OID %s that is not \
  supported by the Directory Server for this type of operation
@@ -707,14 +707,14 @@
 ERR_ADD_CANNOT_PROCESS_ASSERTION_FILTER_369=Entry %s cannot be added \
  because the request contained an LDAP assertion control, but an error \
  occurred while attempting to compare the provided entry against the filter \
- contained in the control:  %s
+ contained in the control: %s
 ERR_ADD_UNSUPPORTED_CRITICAL_CONTROL_370=Entry %s cannot be added \
  because the request contained a critical control with OID %s that is not \
  supported by the Directory Server for this type of operation
 ERR_SEARCH_CANNOT_GET_ENTRY_FOR_ASSERTION_371=The search request cannot \
  be processed because it contains an LDAP assertion control and an error \
  occurred while trying to retrieve the base entry to compare it against the \
- assertion filter:  %s
+ assertion filter: %s
 ERR_SEARCH_NO_SUCH_ENTRY_FOR_ASSERTION_372=The search request cannot be \
  processed because it contains an LDAP assertion control but the search base \
  entry does not exist
@@ -724,7 +724,7 @@
 ERR_SEARCH_CANNOT_PROCESS_ASSERTION_FILTER_374=The search request cannot \
  be processed because it contains an LDAP assertion control, but an error \
  occurred while attempting to compare the base entry against the assertion \
- filter:  %s
+ filter: %s
 ERR_SEARCH_UNSUPPORTED_CRITICAL_CONTROL_375=The search request cannot be \
  processed because it contains a critical control with OID %s that is not \
  supported by the Directory Server for this type of operation
@@ -734,7 +734,7 @@
 ERR_COMPARE_CANNOT_PROCESS_ASSERTION_FILTER_377=Cannot perform the \
  compare operation on entry %s because the request contained an LDAP assertion \
  control, but an error occurred while attempting to compare the target entry \
- against the filter contained in that control:  %s
+ against the filter contained in that control: %s
 ERR_COMPARE_UNSUPPORTED_CRITICAL_CONTROL_378=Cannot perform the compare \
  operation on entry %s because the request contained a critical control with \
  OID %s that is not supported by the Directory Server for this type of \
@@ -753,31 +753,31 @@
  request
 INFO_RESULT_AUTHORIZATION_DENIED_384=Authorization Denied
 ERR_ADD_MISSING_RDN_ATTRIBUTE_385=Entry %s cannot be added because it \
- is missing attribute %s that is contained in the entry's RDN.  All attributes \
+ is missing attribute %s that is contained in the entry's RDN. All attributes \
  used in the RDN must also be provided in the attribute list for the entry
 ERR_ADD_ERROR_NOTIFYING_CHANGE_LISTENER_386=An unexpected error \
  occurred while notifying a change notification listener of an add operation: \
  %s
 ERR_DELETE_ERROR_NOTIFYING_CHANGE_LISTENER_388=An unexpected error \
  occurred while notifying a change notification listener of a delete \
- operation:  %s
+ operation: %s
 ERR_MODIFY_ERROR_NOTIFYING_CHANGE_LISTENER_390=An unexpected error \
  occurred while notifying a change notification listener of a modify \
- operation:  %s
+ operation: %s
 ERR_MODDN_ERROR_NOTIFYING_CHANGE_LISTENER_392=An unexpected error \
  occurred while notifying a change notification listener of a modify DN \
- operation:  %s
+ operation: %s
 ERR_BIND_UNSUPPORTED_CRITICAL_CONTROL_394=Unable to process the bind \
  request because it contained a control with OID %s that was marked critical \
  but this control is not supported for the bind operation
 WARN_BIND_MULTIPLE_USER_SIZE_LIMITS_395=There are multiple \
- user-specific size limit values contained in user entry %s.  The default \
+ user-specific size limit values contained in user entry %s. The default \
  server size limit will be used
 WARN_BIND_CANNOT_PROCESS_USER_SIZE_LIMIT_396=The user-specific size \
  limit value %s contained in user entry %s could not be parsed as an integer. \
  The default server size limit will be used
 WARN_BIND_MULTIPLE_USER_TIME_LIMITS_397=There are multiple \
- user-specific time limit values contained in user entry %s.  The default \
+ user-specific time limit values contained in user entry %s. The default \
  server time limit will be used
 WARN_BIND_CANNOT_PROCESS_USER_TIME_LIMIT_398=The user-specific time \
  limit value %s contained in user entry %s could not be parsed as an integer. \
@@ -787,40 +787,40 @@
  an entry with that name already exists
 ERR_ADD_SYNCH_PREOP_FAILED_401=An error occurred during preoperation \
  synchronization processing for the add operation with connection ID %d and \
- operation ID %d:  %s
+ operation ID %d: %s
 ERR_ADD_SYNCH_POSTOP_FAILED_402=An error occurred during postoperation \
  synchronization processing for the add operation with connection ID %d and \
- operation ID %d:  %s
+ operation ID %d: %s
 ERR_DELETE_SYNCH_PREOP_FAILED_403=An error occurred during \
  preoperation synchronization processing for the delete operation with \
- connection ID %d and operation ID %d:  %s
+ connection ID %d and operation ID %d: %s
 ERR_DELETE_SYNCH_POSTOP_FAILED_404=An error occurred during \
  postoperation synchronization processing for the delete operation with \
- connection ID %d and operation ID %d:  %s
+ connection ID %d and operation ID %d: %s
 ERR_MODIFY_SYNCH_PREOP_FAILED_405=An error occurred during \
  preoperation synchronization processing for the modify operation with \
- connection ID %d and operation ID %d:  %s
+ connection ID %d and operation ID %d: %s
 ERR_MODIFY_SYNCH_POSTOP_FAILED_406=An error occurred during \
  postoperation synchronization processing for the modify operation with \
- connection ID %d and operation ID %d:  %s
+ connection ID %d and operation ID %d: %s
 ERR_MODDN_SYNCH_PREOP_FAILED_407=An error occurred during preoperation \
  synchronization processing for the modify DN operation with connection ID %d \
- and operation ID %d:  %s
+ and operation ID %d: %s
 ERR_MODDN_SYNCH_POSTOP_FAILED_408=An error occurred during \
  postoperation synchronization processing for the modify DN operation with \
- connection ID %d and operation ID %d:  %s
+ connection ID %d and operation ID %d: %s
 ERR_ADD_SYNCH_CONFLICT_RESOLUTION_FAILED_409=An error occurred during \
  conflict resolution synchronization processing for the add operation with \
- connection ID %d and operation ID %d:  %s
+ connection ID %d and operation ID %d: %s
 ERR_DELETE_SYNCH_CONFLICT_RESOLUTION_FAILED_410=An error occurred \
  during conflict resolution synchronization processing for the delete \
- operation with connection ID %d and operation ID %d:  %s
+ operation with connection ID %d and operation ID %d: %s
 ERR_MODIFY_SYNCH_CONFLICT_RESOLUTION_FAILED_411=An error occurred \
  during conflict resolution synchronization processing for the modify \
- operation with connection ID %d and operation ID %d:  %s
+ operation with connection ID %d and operation ID %d: %s
 ERR_MODDN_SYNCH_CONFLICT_RESOLUTION_FAILED_412=An error occurred \
  during conflict resolution synchronization processing for the modify DN \
- operation with connection ID %d and operation ID %d:  %s
+ operation with connection ID %d and operation ID %d: %s
 ERR_ADD_SERVER_READONLY_413=Unable to add entry %s because the \
  Directory Server is configured in read-only mode
 ERR_ADD_BACKEND_READONLY_414=Unable to add entry %s because the \
@@ -845,22 +845,22 @@
  specified password attribute "%s" is not defined in the server schema
 ERR_PWPOLICY_INVALID_PASSWORD_ATTRIBUTE_SYNTAX_426=The password policy \
  definition contained in configuration entry "%s" is invalid because the \
- specified password attribute "%s" has a syntax OID of %s.  The password \
+ specified password attribute "%s" has a syntax OID of %s. The password \
  attribute must have a syntax OID of either 1.3.6.1.4.1.26027.1.3.1 (for the \
  user password syntax) or 1.3.6.1.4.1.4203.1.1.2 (for the authentication \
  password syntax)
 ERR_PWPOLICY_CANNOT_DETERMINE_REQUIRE_CHANGE_BY_TIME_477=An error \
  occurred while attempting to determine the value for attribute \
- ds-cfg-require-change-by-time in configuration entry %s:  %s
+ ds-cfg-require-change-by-time in configuration entry %s: %s
 ERR_PWPOLICY_INVALID_LAST_LOGIN_TIME_FORMAT_482=The password policy \
  definition contained in configuration entry "%s" is invalid because the \
- specified last login time format "%s" is not a valid format string  The last \
+ specified last login time format "%s" is not a valid format string The last \
  login time format string should conform to the syntax described in the API \
  documentation for the <CODE>java.text.SimpleDateFormat</CODE> class
 ERR_PWPOLICY_INVALID_PREVIOUS_LAST_LOGIN_TIME_FORMAT_485=The password \
  policy definition contained in configuration entry "%s" is invalid because \
  the specified previous last login time format "%s" is not a valid format \
- string  The previous last login time format strings should conform to the \
+ string The previous last login time format strings should conform to the \
  syntax described in the API documentation for the \
  <CODE>java.text.SimpleDateFormat</CODE> class
 ERR_PWPOLICY_ATTRIBUTE_OPTIONS_NOT_ALLOWED_496=Attribute options are not \
@@ -870,28 +870,28 @@
 ERR_PWPOLICY_PREENCODED_NOT_ALLOWED_498=Pre-encoded passwords are not \
  allowed for the password attribute %s
 ERR_PWPOLICY_VALIDATION_FAILED_499=The password value for attribute %s \
- was found to be unacceptable:  %s
+ was found to be unacceptable: %s
 ERR_PWPOLICY_MUST_HAVE_WARNING_IF_NOT_EXPIRE_WITHOUT_WARNING_500=The \
  password policy defined in configuration entry %s is configured to always \
  send at least one warning notification before the password is expired, but no \
- warning interval has been set.  If configuration attribute \
+ warning interval has been set. If configuration attribute \
  ds-cfg-expire-passwords-without-warning is set to "false", then configuration \
  attribute ds-cfg-password-expiration-warning-interval must have a positive \
  value
 ERR_ENQUEUE_BIND_IN_PROGRESS_501=A bind operation is currently in \
- progress on the associated client connection.  No other requests may be made \
+ progress on the associated client connection. No other requests may be made \
  on this client connection until the bind processing has completed
 ERR_ENQUEUE_MUST_CHANGE_PASSWORD_502=%s must change their password \
  before it will be allowed to request any other operations
 ERR_PWPSTATE_CANNOT_DECODE_SUBENTRY_VALUE_AS_DN_504=An error occurred \
  while attempting to decode the ds-pwp-password-policy-dn value "%s" in user \
- entry "%s" as a DN:  %s
+ entry "%s" as a DN: %s
 ERR_PWPSTATE_NO_SUCH_POLICY_505=User entry %s is configured to use a \
  password policy subentry of %s but no such password policy has been defined \
  in the server configuration
 ERR_PWPSTATE_CANNOT_DECODE_GENERALIZED_TIME_506=An error occurred while \
  attempting to decode value "%s" for attribute %s in user entry %s in \
- accordance with the generalized time format:  %s
+ accordance with the generalized time format: %s
 ERR_PWPSTATE_CANNOT_DECODE_BOOLEAN_507=Unable to decode value "%s" for \
  attribute %s in user entry %s as a Boolean value
 ERR_ADD_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_508=The entry %s cannot be \
@@ -925,7 +925,7 @@
 ERR_BIND_OPERATION_PASSWORD_EXPIRED_521=Rejecting a bind request \
  because that user's password is expired
 ERR_PWPSTATE_CANNOT_UPDATE_USER_ENTRY_522=An error occurred while \
- attempting to update password policy state information for user %s:  %s
+ attempting to update password policy state information for user %s: %s
 ERR_BIND_OPERATION_INSECURE_SASL_BIND_523=Rejecting a SASL %s bind \
  request for user %s because the password policy requires secure \
  authentication
@@ -958,15 +958,15 @@
 ERR_MODIFY_MULTIPLE_PASSWORDS_NOT_ALLOWED_543=The password change would \
  result in multiple password values in the user entry, which is not allowed
 ERR_MODIFY_PW_VALIDATION_FAILED_544=The provided password value was \
- rejected by a password validator:  %s
+ rejected by a password validator: %s
 ERR_MODIFY_MUST_CHANGE_PASSWORD_545=%s must change their password before \
  it will be allowed to perform any other operations
 WARN_BIND_PASSWORD_EXPIRING_547=The user password is about to expire \
- (time to expiration:  %s)
+ (time to expiration: %s)
 ERR_BIND_ACCOUNT_TEMPORARILY_LOCKED_548=The account has been locked as a \
- result of too many failed authentication attempts (time to unlock:  %s)
+ result of too many failed authentication attempts (time to unlock: %s)
 ERR_BIND_ACCOUNT_PERMANENTLY_LOCKED_549=The account has been locked as a \
- result of too many failed authentication attempts.  It may only be unlocked \
+ result of too many failed authentication attempts. It may only be unlocked \
  by an administrator
 INFO_MODIFY_PASSWORD_CHANGED_551=The user password has been changed
 INFO_MODIFY_PASSWORD_RESET_552=The user password has been administratively \
@@ -980,11 +980,11 @@
 ERR_MODIFY_PASSWORD_EXISTS_556=The specified password value already \
  exists in the user entry
 WARN_BIND_MULTIPLE_USER_LOOKTHROUGH_LIMITS_557=There are multiple \
- user-specific lookthrough limit values contained in user entry %s.  The \
+ user-specific lookthrough limit values contained in user entry %s. The \
  default server lookthrough limit will be used
 WARN_BIND_CANNOT_PROCESS_USER_LOOKTHROUGH_LIMIT_558=The user-specific \
  lookthrough limit value %s contained in user entry %s could not be parsed as \
- an integer.  The default server lookthrough limit will be used
+ an integer. The default server lookthrough limit will be used
 ERR_ENTRY_DUPLICATE_VALUES_559=Unable to add one or more values to \
  attribute %s because at least one of the values already exists
 ERR_ENTRY_NO_SUCH_VALUE_560=Unable to remove one or more values from \
@@ -1032,14 +1032,14 @@
  %s but the new base DN is not
 WARN_REGISTER_BASEDN_ENTRIES_IN_MULTIPLE_BACKENDS_576=Backend %s \
  already contains entry %s which has just been registered as the base DN for \
- backend %s.  These conflicting entries can cause unexpected or errant search \
+ backend %s. These conflicting entries can cause unexpected or errant search \
  results, and both backends should be reinitialized to ensure that each has \
  the correct content
 ERR_DEREGISTER_BASEDN_NOT_REGISTERED_577=Unable to de-register base DN \
  %s with the Directory Server because that base DN is not registered for any \
  active backend
 WARN_DEREGISTER_BASEDN_MISSING_HIERARCHY_578=Base DN %s has been \
- deregistered from the Directory Server for backend %s.  This base DN had both \
+ deregistered from the Directory Server for backend %s. This base DN had both \
  superior and subordinate entries in other backends, and there might be \
  inconsistent or unexpected behavior when accessing entries in this portion of \
  the hierarchy because of the missing entries that had been held in the \
@@ -1048,7 +1048,7 @@
  element with definition "%s" because a circular reference was identified when \
  attempting to rebuild other schema elements dependent upon it
 ERR_REJECT_UNAUTHENTICATED_OPERATION_580=Rejecting the requested \
- operation  because the connection has not been authenticated
+ operation because the connection has not been authenticated
 WARN_ADD_ATTR_IS_OBSOLETE_581=Entry "%s" cannot be added because it \
  contains attribute type %s which is declared OBSOLETE in the server schema
 WARN_ADD_OC_IS_OBSOLETE_582=Entry "%s" cannot be added because it \
@@ -1066,7 +1066,7 @@
  that entry, but there is a DIT structure rule for the parent entry %s
 ERR_ENTRY_SCHEMA_COULD_NOT_CHECK_PARENT_DSR_587=An unexpected error \
  occurred while attempting to perform DIT structure rule processing for the \
- parent of entry %s:  %s
+ parent of entry %s: %s
 WARN_CLIENTCONNECTION_DISCONNECT_DUE_TO_DELETE_588=Terminating the \
  client connection because its associated authentication or authorization \
  entry %s has been deleted
@@ -1097,7 +1097,7 @@
 ERR_ENTRY_DECODE_UNRECOGNIZED_VERSION_600=Unable to decode an entry \
  because it had an unsupported entry version byte value of %s
 ERR_ENTRY_DECODE_EXCEPTION_601=Unable to decode an entry because an \
- unexpected exception was caught during processing:  %s
+ unexpected exception was caught during processing: %s
 ERR_SEARCH_FILTER_NOT_EXACTLY_ONE_602=The provided search filter "%s" \
  could not be decoded because the NOT filter between positions %d and %d did \
  not contain exactly one filter component
@@ -1130,7 +1130,7 @@
 ERR_COMPRESSEDSCHEMA_UNKNOWN_OC_TOKEN_621=Unable to decode the \
  provided object class set because it used an undefined token %s
 ERR_COMPRESSEDSCHEMA_CANNOT_WRITE_UPDATED_DATA_622=Unable to write the \
- updated compressed schema token data:  %s
+ updated compressed schema token data: %s
 ERR_ENTRYENCODECFG_INVALID_LENGTH_623=Unable to decode the provided \
  entry encode configuration element because it has an invalid length
 INFO_RESULT_NO_OPERATION_624=No Operation
@@ -1141,7 +1141,7 @@
 ERR_SEARCH_FILTER_EXTENSIBLE_MATCH_NO_AD_OR_MR_626=The provided search \
  filter "%s" could not be decoded because the extensible match component \
  starting at position %d did not contain either an attribute description or a \
- matching rule ID.  At least one of these must be provided
+ matching rule ID. At least one of these must be provided
 ERR_SEARCH_FILTER_EXTENSIBLE_MATCH_NO_SUCH_MR_627=The provided search \
  filter "%s" could not be decoded because the extensible match component \
  starting at position %d referenced an unknown matching rule %s
@@ -1152,11 +1152,11 @@
 ERR_MODIFY_PW_IN_HISTORY_629=The provided new password was found in the \
  password history for the user
 WARN_BIND_MULTIPLE_USER_IDLE_TIME_LIMITS_630=There are multiple \
- user-specific idle time limit values contained in user entry %s.  The default \
+ user-specific idle time limit values contained in user entry %s. The default \
  server idle time limit will be used
 WARN_BIND_CANNOT_PROCESS_USER_IDLE_TIME_LIMIT_631=The user-specific \
  idle time limit value %s contained in user entry %s could not be parsed as an \
- integer.  The default server idle time limit will be used
+ integer. The default server idle time limit will be used
 INFO_IDLETIME_LIMIT_EXCEEDED_632=This connection has been terminated because \
  it has remained idle for too long
 ERR_PWPOLICY_WARNING_INTERVAL_LARGER_THAN_MAX_AGE_633=The password \
@@ -1178,35 +1178,35 @@
  network group %s with the Directory Server because another network group with \
  the same network group ID is already registered
 ERR_IDLETIME_DISCONNECT_ERROR_638=An error occurred while attempting to \
- disconnect client connection %d:  %s
+ disconnect client connection %d: %s
 ERR_IDLETIME_UNEXPECTED_ERROR_639=An unexpected error occurred in the \
- idle time limit thread:  %s
+ idle time limit thread: %s
 ERR_DIRCFG_SERVER_ALREADY_RUNNING_640=The Directory Server is \
- currently running.  Environment configuration changes are not allowed with \
+ currently running. Environment configuration changes are not allowed with \
  the server running
 ERR_DIRCFG_INVALID_SERVER_ROOT_641=The specified server root directory \
- '%s' is invalid.  The specified path must exist and must be a directory
+ '%s' is invalid. The specified path must exist and must be a directory
 ERR_DIRCFG_INVALID_CONFIG_FILE_642=The specified config file path '%s' \
- is invalid.  The specified path must exist and must be a file
+ is invalid. The specified path must exist and must be a file
 ERR_DIRCFG_INVALID_CONFIG_CLASS_643=The specified config handler class \
- '%s' is invalid.  The specified class must be a subclass of the \
+ '%s' is invalid. The specified class must be a subclass of the \
  org.opends.server.api.ConfigHandler superclass
 ERR_DIRCFG_INVALID_SCHEMA_DIRECTORY_644=The specified schema \
- configuration directory '%s' is invalid.  The specified path must exist and \
+ configuration directory '%s' is invalid. The specified path must exist and \
  must be a directory
 ERR_DIRCFG_INVALID_LOCK_DIRECTORY_645=The specified lock directory \
- '%s' is invalid.  The specified path must exist and must be a directory
+ '%s' is invalid. The specified path must exist and must be a directory
 ERR_DIRCFG_INVALID_CONCURRENCY_LEVEL_646=The specified lock table \
- concurrency level %d is invalid.  It must be an integer value greater than \
+ concurrency level %d is invalid. It must be an integer value greater than \
  zero
 ERR_DIRCFG_INVALID_LOCK_TABLE_SIZE_647=The specified initial lock \
- table size %d is invalid.  It must be an integer value greater than zero
+ table size %d is invalid. It must be an integer value greater than zero
 ERR_CANNOT_SET_ENVIRONMENT_CONFIG_WHILE_RUNNING_648=The Directory \
- Server is currently running.  The environment configuration can not be \
+ Server is currently running. The environment configuration can not be \
  altered while the server is online
 ERR_CRYPTOMGR_SSL_CONTEXT_CANNOT_INITIALIZE_649=An error occurred \
  while attempting to initialize a SSL context for server to server \
- communication:  %s
+ communication: %s
 ERR_CRYPTOMGR_ADS_TRUST_STORE_BACKEND_NOT_ENABLED_650=The ADS trust \
  store backend %s is not enabled
 ERR_CRYPTOMGR_ADS_TRUST_STORE_BACKEND_WRONG_CLASS_651=The backend %s \
@@ -1229,31 +1229,31 @@
  configuration entry %s references deprecated password storage scheme DN %s \
  which does not support the auth password syntax
 WARN_GROUP_FILTER_NOT_INDEXED_660=The search filter "%s" used by group \
- implementation %s is not indexed in backend %s.  Backend initialization \
+ implementation %s is not indexed in backend %s. Backend initialization \
  for this group implementation might take a very long time to complete
 ERR_CRYPTOMGR_CANNOT_GET_REQUESTED_DIGEST_661=CryptoManager cannot get \
- the requested digest %s:  %s
+ the requested digest %s: %s
 ERR_CRYPTOMGR_CANNOT_GET_REQUESTED_MAC_ENGINE_662=CryptoManager cannot \
- get the requested MAC engine %s:  %s
+ get the requested MAC engine %s: %s
 ERR_CRYPTOMGR_CANNOT_GET_REQUESTED_ENCRYPTION_CIPHER_663=CryptoManager \
- cannot get the requested encryption cipher %s:  %s
+ cannot get the requested encryption cipher %s: %s
 ERR_CRYPTOMGR_CANNOT_GET_PREFERRED_KEY_WRAPPING_CIPHER_664=CryptoManager \
- cannot get the preferred key wrapping cipher:  %s
+ cannot get the preferred key wrapping cipher: %s
 ERR_CRYPTOMGR_FAILED_TO_INITIATE_INSTANCE_KEY_GENERATION_665=CryptoManager \
  failed to add entry "%s" to initiate instance key generation
 ERR_CRYPTOMGR_FAILED_TO_RETRIEVE_INSTANCE_CERTIFICATE_666=CryptoManager \
- failed to retrieve entry "%s" (the instance-key-pair public-key-certificate):  %s
+ failed to retrieve entry "%s" (the instance-key-pair public-key-certificate): %s
 ERR_CRYPTOMGR_FAILED_TO_COMPUTE_INSTANCE_KEY_IDENTIFIER_667=CryptoManager \
- failed to compute an instance key identifier:  %s
+ failed to compute an instance key identifier: %s
 ERR_CRYPTOMGR_FAILED_TO_ADD_INSTANCE_KEY_ENTRY_TO_ADS_668=Failed \
  to add entry "%s"
 ERR_CRYPTOMGR_FAILED_TO_PUBLISH_INSTANCE_KEY_ENTRY_669=CryptoManager \
- failed to publish the instance-key-pair public-key-certificate entry in ADS:  %s
+ failed to publish the instance-key-pair public-key-certificate entry in ADS: %s
 ERR_CRYPTOMGR_FAILED_TO_RETRIEVE_ADS_TRUSTSTORE_CERTS_670=CryptoManager \
  failed to retrieve the collection of instance-key-pair public-key-certificates \
- from ADS container "%s":  %s
+ from ADS container "%s": %s
 ERR_CRYPTOMGR_FAILED_TO_ENCODE_SYMMETRIC_KEY_ATTRIBUTE_671=CryptoManager \
- failed to encode symmetric key attribute value:  %s
+ failed to encode symmetric key attribute value: %s
 ERR_CRYPTOMGR_DECODE_SYMMETRIC_KEY_ATTRIBUTE_FIELD_COUNT_672=CryptoManager \
  symmetric key attribute value "%s" syntax is invalid: incorrect number of fields
 ERR_CRYPTOMGR_DECODE_SYMMETRIC_KEY_ATTRIBUTE_SYNTAX_673=CryptoManager \
@@ -1262,25 +1262,25 @@
 ERR_CRYPTOMGR_DECODE_SYMMETRIC_KEY_ATTRIBUTE_NO_PRIVATE_674=CryptoManager \
  failed to retrieve the instance-key-pair private-key: %s
 ERR_CRYPTOMGR_DECODE_SYMMETRIC_KEY_ATTRIBUTE_DECIPHER_675=CryptoManager \
- failed to decipher the wrapped secret-key value:  %s
+ failed to decipher the wrapped secret-key value: %s
 ERR_CRYPTOMGR_REWRAP_SYMMETRIC_KEY_ATTRIBUTE_NO_WRAPPER_676=CryptoManager \
  cannot find the public-key-certificate (identifier "%s") requested for symmetric \
  key re-encoding
 ERR_CRYPTOMGR_INVALID_KEY_IDENTIFIER_SYNTAX_677=CryptoManager failed to decode \
- the key entry identifier "%s":  %s
+ the key entry identifier "%s": %s
 ERR_CRYPTOMGR_GET_MAC_ENGINE_INVALID_MAC_ALGORITHM_678=CrytpoManager \
- passed invalid MAC algorithm "%s":  %s
+ passed invalid MAC algorithm "%s": %s
 ERR_CRYPTOMGR_GET_MAC_ENGINE_CANNOT_INITIALIZE_679=CryptoManager \
- failed to initialize MAC engine:  %s
+ failed to initialize MAC engine: %s
 ERR_CRYPTOMGR_GET_CIPHER_INVALID_CIPHER_TRANSFORMATION_680=CryptoManager \
- passed invalid Cipher transformation "%s":  %s
+ passed invalid Cipher transformation "%s": %s
 ERR_CRYPTOMGR_GET_CIPHER_CANNOT_INITIALIZE_681=CryptoManager \
- cannot initialize Cipher:  %s
+ cannot initialize Cipher: %s
 ERR_CRYPTOMGR_GET_CIPHER_STREAM_PROLOGUE_WRITE_ERROR_682=CryptoManager \
- failed to write the stream prologue:  %s
+ failed to write the stream prologue: %s
 ERR_CRYPTOMGR_DECRYPT_FAILED_TO_READ_KEY_IDENTIFIER_683=CryptoManager \
  failed to decrypt the supplied data because it could not read the symmetric \
- key identifier in the data prologue:  %s
+ key identifier in the data prologue: %s
 ERR_CRYPTOMGR_DECRYPT_UNKNOWN_KEY_IDENTIFIER_684=CryptoManager failed to \
  decrypt the supplied data because the symmetric key identifier in the data \
  prologue does not match any known key entries
@@ -1289,7 +1289,7 @@
  vector in the data prologue
 ERR_CRYPTOMGR_DECRYPT_CIPHER_INPUT_STREAM_ERROR_686=CryptoManager failed \
  to decrypt the supplied data because there was an error reading from the \
- input stream:  %s
+ input stream: %s
 ERR_CRYPTOMGR_IMPORT_KEY_ENTRY_FAILED_TO_DECODE_687=CryptoManager \
  failed to import the symmetric key entry "%s" because it could not obtain a \
  symmetric key attribute value that can be decoded by this instance
@@ -1297,14 +1297,14 @@
  detected a field mismatch between the key entry to be imported and an entry \
  in the key cache that share the key identifier "%s"
 ERR_CRYPTOMGR_IMPORT_KEY_ENTRY_FAILED_OTHER_689=CryptoManager failed \
- to import the symmetric key entry "%s":  %s
+ to import the symmetric key entry "%s": %s
 ERR_CRYPTOMGR_IMPORT_KEY_ENTRY_FAILED_TO_ADD_KEY_690=CryptoManager \
  failed to import the symmetric key entry "%s" because it could not add \
  a symmetric key attribute value that can be decoded by this instance
 ERR_CRYPTOMGR_INVALID_SYMMETRIC_KEY_ALGORITHM_691=CryptoManager failed \
- to instantiate a KeyGenerator for algorithm "%s":  %s
+ to instantiate a KeyGenerator for algorithm "%s": %s
 ERR_CRYPTOMGR_SYMMETRIC_KEY_ENTRY_ADD_FAILED_692=CryptoManager failed \
- to add locally produced symmetric key entry "%s":  %s
+ to add locally produced symmetric key entry "%s": %s
 ERR_CRYPTOMGR_FULL_CIPHER_TRANSFORMATION_REQUIRED_693=CryptoManager \
  cipher transformation specification "%s" is invalid: it must be of the form \
  "algorithm/mode/padding"
@@ -1313,7 +1313,7 @@
  "algorithm/mode/padding"
 ERR_CRYPTOMGR_DECRYPT_FAILED_TO_READ_PROLOGUE_VERSION_695=CryptoManager \
  failed to decrypt the supplied data because it could not read the version \
- number in the data prologue:  %s
+ number in the data prologue: %s
 ERR_CRYPTOMGR_DECRYPT_UNKNOWN_PROLOGUE_VERSION_696=CryptoManager failed to \
  decrypt the supplied data because the version "%d" in the data prologue is \
  unknown
@@ -1323,9 +1323,9 @@
 NOTE_VERSION_698=%s
 NOTE_BUILD_ID_699=Build ID:                 %s
 ERR_CANNOT_CANCEL_START_TLS_700=Start TLS extended operations cannot be \
-  canceled
+ canceled
 ERR_CANNOT_CANCEL_CANCEL_701=Cancel extended operations can not be \
-  canceled
+ canceled
 ERR_MODDN_NEW_SUPERIOR_IN_SUBTREE_702=The modify DN operation \
  for entry %s cannot be performed because the new superior entry %s is equal \
  to or a subordinate of the entry to be moved
@@ -1387,7 +1387,7 @@
 ERR_DSCORE_ERROR_NODETACH_TIMEOUT_723=In no-detach mode, the 'timeout' \
 option cannot be used
 WARN_SUBENTRY_FILTER_NOT_INDEXED_724=The search filter "%s" used by \
- subentry manager is not indexed in backend %s.  Backend initialization \
+ subentry manager is not indexed in backend %s. Backend initialization \
  for subentry manager processing might take a very long time to complete
 INFO_RESULT_UNDEFINED_725=Undefined
 ERR_PWPOLICY_NO_PWDPOLICY_OC_726=The entry %s does not contain the \
@@ -1400,7 +1400,7 @@
  allowed cryptography strength "%d" in jurisdiction policy files
 ERR_DISK_SPACE_MONITOR_UPDATE_FAILED_729=Failed to update free disk space \
  for directory %s: %s
-ERR_MAX_PSEARCH_LIMIT_EXCEEDED_730=The directory server is not accepting  \
+ERR_MAX_PSEARCH_LIMIT_EXCEEDED_730=The directory server is not accepting \
  a new persistent search request because the server has already reached its limit
 INFO_ERROR_MAX_THROUGHPUT_EXCEEDED_735=Unable to process operation \
  because the network group has already reached its maximum throughput of %d \
@@ -1414,13 +1414,13 @@
  while attempting to put the operation on the work queue
 INFO_DISCONNECT_DUE_TO_INVALID_CREDENTIALS_741=Invalid Credentials
 WARN_ADD_OP_INVALID_SYNTAX_NO_VALUE_742=Entry "%s" contains a value for \
- attribute %s that is invalid according to the syntax for that attribute:  %s
+ attribute %s that is invalid according to the syntax for that attribute: %s
 ERR_MODIFY_ADD_INVALID_SYNTAX_NO_VALUE_743=When attempting to modify entry \
  %s, one value for attribute %s was found to be invalid according to the \
- associated syntax:  %s
+ associated syntax: %s
 ERR_MODIFY_REPLACE_INVALID_SYNTAX_NO_VALUE_744=When attempting to modify \
  entry %s to replace the set of values for attribute %s, one value was found to \
- be invalid according to the associated syntax:  %s
+ be invalid according to the associated syntax: %s
 ERR_PWPOLICY_UNKNOWN_VALIDATOR_745=The password policy \
 definition contained in configuration entry "%s" is invalid because the \
 password validator "%s" specified in attribute "%s" cannot be found
diff --git a/opendj3-server-dev/src/messages/messages/dsconfig.properties b/opendj3-server-dev/src/messages/messages/dsconfig.properties
index 396b202..8089ef1 100644
--- a/opendj3-server-dev/src/messages/messages/dsconfig.properties
+++ b/opendj3-server-dev/src/messages/messages/dsconfig.properties
@@ -414,12 +414,12 @@
  command is run in interactive mode
 ERR_DSCFG_ERROR_WRITING_EQUIVALENT_COMMAND_LINE_154=An error occurred \
  while attempting to write equivalent non-interactive command line to file \
- %s.  Error details:  %s
+ %s. Error details: %s
 ERR_DSCFG_CANNOT_WRITE_EQUIVALENT_COMMAND_LINE_FILE_155=Cannot write \
- to file %s.  Verify that you have access rights to that file and that you \
+ to file %s. Verify that you have access rights to that file and that you \
  provided the full path of the file
 ERR_DSCFG_EQUIVALENT_COMMAND_LINE_FILE_DIRECTORY_156=The specified \
- path %s to write the equivalent command is a directory.  You must specify a \
+ path %s to write the equivalent command is a directory. You must specify a \
  path to a file
 ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT_NOT_TRUSTED_158=Unable to connect to the \
  server at %s on port %s. In non-interactive mode, if the trustStore related parameters are not used, \
diff --git a/opendj3-server-dev/src/messages/messages/extension.properties b/opendj3-server-dev/src/messages/messages/extension.properties
index 4582f98..8c3c186 100644
--- a/opendj3-server-dev/src/messages/messages/extension.properties
+++ b/opendj3-server-dev/src/messages/messages/extension.properties
@@ -49,29 +49,29 @@
 #
 ERR_PWSCHEME_CANNOT_INITIALIZE_MESSAGE_DIGEST_1=An error occurred \
  while attempting to initialize the message digest generator for the %s \
- algorithm:  %s
+ algorithm: %s
 ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD_2=An error occurred \
- while attempting to base64-decode the password value %s:  %s
+ while attempting to base64-decode the password value %s: %s
 ERR_PWSCHEME_NOT_REVERSIBLE_3=The %s password storage scheme is not \
  reversible, so it is impossible to recover the plaintext version of an \
  encoded password
 ERR_JMX_ALERT_HANDLER_CANNOT_REGISTER_4=An error occurred while trying \
- to register the JMX alert handler with the MBean server:  %s
+ to register the JMX alert handler with the MBean server: %s
 ERR_PWSCHEME_CANNOT_ENCODE_PASSWORD_5=An unexpected error occurred while \
  attempting to encode a password using the storage scheme defined in class %s: \
  %s
 ERR_CACHE_INVALID_INCLUDE_FILTER_6=The ds-cfg-include-filter \
  attribute of configuration entry %s, which specifies a set of search filters \
  that may be used to control which entries are included in the cache, has an \
- invalid value of "%s":  %s
+ invalid value of "%s": %s
 ERR_CACHE_INVALID_EXCLUDE_FILTER_7=The ds-cfg-exclude-filter \
  attribute of configuration entry %s, which specifies a set of search filters \
  that may be used to control which entries are excluded from the cache, has an \
- invalid value of "%s":  %s
+ invalid value of "%s": %s
 ERR_FIFOCACHE_CANNOT_INITIALIZE_8=A fatal error occurred while trying \
- to initialize fifo entry cache:  %s
+ to initialize fifo entry cache: %s
 ERR_SOFTREFCACHE_CANNOT_INITIALIZE_9=A fatal error occurred while \
- trying to initialize soft reference entry cache:  %s
+ trying to initialize soft reference entry cache: %s
 NOTE_CACHE_PRELOAD_PROGRESS_START_10=Starting the entry cache preload for \
  %s backend
 NOTE_CACHE_PRELOAD_PROGRESS_REPORT_11=The entry cache preload for %s backend \
@@ -84,9 +84,9 @@
  supported by %s backend, and as a result no entries from this backend will \
  be preloaded into the entry cache
 ERR_CACHE_PRELOAD_ENTRY_FAILED_15=Failed to preload %s entry into \
- the entry cache:  %s
+ the entry cache: %s
 ERR_EXTOP_PASSMOD_CANNOT_DECODE_REQUEST_33=An unexpected error occurred \
- while attempting to decode the password modify extended request sequence:  %s
+ while attempting to decode the password modify extended request sequence: %s
 ERR_EXTOP_PASSMOD_NO_AUTH_OR_USERID_34=The password modify extended \
  request cannot be processed because it does not contain an authorization ID \
  and the underlying connection is not authenticated
@@ -98,7 +98,7 @@
  DN for use in the authorization ID for the operation
 ERR_EXTOP_PASSMOD_INVALID_AUTHZID_STRING_37=The password modify extended \
  request cannot be processed because it contained an invalid userIdentity \
- field.  The provided userIdentity string was "%s"
+ field. The provided userIdentity string was "%s"
 ERR_EXTOP_PASSMOD_NO_USER_ENTRY_BY_AUTHZID_38=The password modify \
  extended request cannot be processed because it was not possible to identify \
  the user entry to update based on the authorization DN of "%s"
@@ -106,14 +106,14 @@
  operation cannot be processed because the current password provided for the \
  user is invalid
 INFO_FILE_KEYMANAGER_DESCRIPTION_FILE_43=Path to the file \
- containing the Directory Server keystore information.  Changes to this \
+ containing the Directory Server keystore information. Changes to this \
  configuration attribute will take effect the next time that the key manager \
  is accessed
 ERR_FILE_KEYMANAGER_NO_SUCH_FILE_45=The keystore file %s specified in \
- attribute ds-cfg-key-store-file of configuration entry %s does  not exist
+ attribute ds-cfg-key-store-file of configuration entry %s does not exist
 ERR_FILE_KEYMANAGER_CANNOT_DETERMINE_FILE_46=An unexpected error \
  occurred while trying to determine the value of configuration attribute \
- ds-cfg-key-store-file in configuration entry %s:  %s
+ ds-cfg-key-store-file in configuration entry %s: %s
 ERR_FILE_KEYMANAGER_PIN_PROPERTY_NOT_SET_50=Java property %s which is \
  specified in attribute ds-cfg-key-store-pin-property of configuration entry \
  %s should contain the PIN needed to access the file-based key manager, but \
@@ -127,17 +127,17 @@
  needed to access the file-based key manager, but this file does not exist
 ERR_FILE_KEYMANAGER_PIN_FILE_CANNOT_READ_57=An error occurred while \
  trying to read the keystore PIN from file %s specified in configuration \
- attribute ds-cfg-key-store-pin-file of configuration entry %s:  %s
+ attribute ds-cfg-key-store-pin-file of configuration entry %s: %s
 ERR_FILE_KEYMANAGER_PIN_FILE_EMPTY_58=File %s specified in attribute \
  ds-cfg-key-store-pin-file of configuration entry %s should contain the PIN \
  needed to access the file-based key manager, but this file is empty
 ERR_FILE_KEYMANAGER_CANNOT_DETERMINE_PIN_FROM_ATTR_60=An unexpected \
  error occurred while trying to determine the value of configuration attribute \
- ds-cfg-key-store-pin in configuration entry %s:  %s
+ ds-cfg-key-store-pin in configuration entry %s: %s
 ERR_FILE_KEYMANAGER_CANNOT_LOAD_62=An error occurred while trying to \
- load the keystore contents from file %s:  %s
+ load the keystore contents from file %s: %s
 ERR_FILE_KEYMANAGER_INVALID_TYPE_63=The keystore type %s specified in \
- attribute ds-cfg-key-store-type of configuration entry %s is not valid:  %s
+ attribute ds-cfg-key-store-type of configuration entry %s is not valid: %s
 ERR_PKCS11_KEYMANAGER_PIN_PROPERTY_NOT_SET_68=Java property %s which \
  is specified in attribute ds-cfg-key-store-pin-property of configuration \
  entry %s should contain the PIN needed to access the PKCS#11 key manager, but \
@@ -152,27 +152,27 @@
  exist
 ERR_PKCS11_KEYMANAGER_PIN_FILE_CANNOT_READ_75=An error occurred while \
  trying to read the keystore PIN from file %s specified in configuration \
- attribute ds-cfg-key-store-pin-file of configuration entry %s:  %s
+ attribute ds-cfg-key-store-pin-file of configuration entry %s: %s
 ERR_PKCS11_KEYMANAGER_PIN_FILE_EMPTY_76=File %s specified in attribute \
  ds-cfg-key-store-pin-file of configuration entry %s should contain the PIN \
  needed to access the PKCS#11 key manager, but this file is empty
 ERR_PKCS11_KEYMANAGER_CANNOT_DETERMINE_PIN_FROM_ATTR_79=An unexpected \
  error occurred while trying to determine the value of configuration attribute \
- ds-cfg-key-store-pin in configuration entry %s:  %s
+ ds-cfg-key-store-pin in configuration entry %s: %s
 ERR_PKCS11_KEYMANAGER_CANNOT_LOAD_81=An error occurred while trying to \
- access the PKCS#11 key manager:  %s
+ access the PKCS#11 key manager: %s
 ERR_FILE_KEYMANAGER_CANNOT_CREATE_FACTORY_83=An error occurred while \
  trying to create a key manager factory to access the contents of keystore \
- file %s:  %s
+ file %s: %s
 ERR_PKCS11_KEYMANAGER_CANNOT_CREATE_FACTORY_84=An error occurred while \
  trying to create a key manager factory to access the contents of the PKCS#11 \
- keystore:  %s
+ keystore: %s
 ERR_FILE_TRUSTMANAGER_NO_SUCH_FILE_87=The trust store file %s \
  specified in attribute ds-cfg-trust-store-file of configuration entry %s does \
  not exist
 ERR_FILE_TRUSTMANAGER_CANNOT_DETERMINE_FILE_88=An unexpected error \
  occurred while trying to determine the value of configuration attribute \
- ds-cfg-trust-store-file in configuration entry %s:  %s
+ ds-cfg-trust-store-file in configuration entry %s: %s
 ERR_FILE_TRUSTMANAGER_PIN_PROPERTY_NOT_SET_92=Java property %s which \
  is specified in attribute ds-cfg-trust-store-pin-property of configuration \
  entry %s should contain the PIN needed to access the file-based trust \
@@ -187,19 +187,19 @@
  does not exist
 ERR_FILE_TRUSTMANAGER_PIN_FILE_CANNOT_READ_99=An error occurred while \
  trying to read the trust store PIN from file %s specified in configuration \
- attribute ds-cfg-trust-store-pin-file of configuration entry %s:  %s
+ attribute ds-cfg-trust-store-pin-file of configuration entry %s: %s
 ERR_FILE_TRUSTMANAGER_PIN_FILE_EMPTY_100=File %s specified in \
  attribute ds-cfg-trust-store-pin-file of configuration entry %s should \
  contain the PIN needed to access the file-based trust manager, but this file \
  is empty
 ERR_FILE_TRUSTMANAGER_CANNOT_LOAD_104=An error occurred while trying \
- to load the trust store contents from file %s:  %s
+ to load the trust store contents from file %s: %s
 ERR_FILE_TRUSTMANAGER_CANNOT_CREATE_FACTORY_105=An error occurred \
  while trying to create a trust manager factory to access the contents of \
- trust store file %s:  %s
+ trust store file %s: %s
 ERR_FILE_TRUSTMANAGER_INVALID_TYPE_106=The trust store type %s \
  specified in attribute ds-cfg-trust-store-type of configuration entry %s is \
- not valid:  %s
+ not valid: %s
 ERR_SEDCM_NO_PEER_CERTIFICATE_118=Could not map the provided certificate \
  chain to a user entry because no peer certificate was available
 ERR_SEDCM_PEER_CERT_NOT_X509_119=Could not map the provided certificate \
@@ -207,10 +207,10 @@
  (peer certificate format was %s)
 ERR_SEDCM_CANNOT_DECODE_SUBJECT_AS_DN_120=Could not map the provided \
  certificate chain to a user because the peer certificate subject "%s" could \
- not be decoded as an LDAP DN:  %s
+ not be decoded as an LDAP DN: %s
 ERR_SEDCM_CANNOT_GET_ENTRY_121=Could not map the provided certificate \
  chain to a user because an error occurred while attempting to retrieve the \
- user entry with DN "%s":  %s
+ user entry with DN "%s": %s
 ERR_SEDCM_NO_USER_FOR_DN_122=Could not map the provided certificate \
  chain to a user because no user entry exists with a DN of %s
 ERR_SASLEXTERNAL_NO_CLIENT_CONNECTION_123=The SASL EXTERNAL bind request \
@@ -238,11 +238,11 @@
  certificate presented by the client
 ERR_SASLEXTERNAL_CANNOT_VALIDATE_CERT_139=An error occurred while \
  attempting to validate the peer certificate presented by the client with a \
- certificate from the user's entry %s:  %s
+ certificate from the user's entry %s: %s
 ERR_SASLPLAIN_NO_SASL_CREDENTIALS_147=SASL PLAIN authentication requires \
  that SASL credentials be provided but none were included in the bind request
 ERR_SASLPLAIN_NO_NULLS_IN_CREDENTIALS_148=The SASL PLAIN bind request \
- did not include any NULL characters.  NULL characters are required as \
+ did not include any NULL characters. NULL characters are required as \
  delimiters between the authorization ID and authentication ID, and also \
  between the authentication ID and the password
 ERR_SASLPLAIN_NO_SECOND_NULL_149=The SASL PLAIN bind request did not \
@@ -250,20 +250,20 @@
  delimiter between the authentication ID and the password
 ERR_SASLPLAIN_ZERO_LENGTH_AUTHCID_150=The authentication ID contained in \
  the SASL PLAIN bind request had a length of zero characters, which is not \
- allowed.  SASL PLAIN authentication does not allow an empty string for use as \
+ allowed. SASL PLAIN authentication does not allow an empty string for use as \
  the authentication ID
 ERR_SASLPLAIN_ZERO_LENGTH_PASSWORD_151=The password contained in the \
  SASL PLAIN bind request had a length of zero characters, which is not \
- allowed.  SASL PLAIN authentication does not allow an empty string for use as \
+ allowed. SASL PLAIN authentication does not allow an empty string for use as \
  the password
 ERR_SASLPLAIN_CANNOT_DECODE_AUTHCID_AS_DN_152=An error occurred while \
  attempting to decode the SASL PLAIN authentication ID "%s" because it \
- appeared to contain a DN but DN decoding failed:  %s
+ appeared to contain a DN but DN decoding failed: %s
 ERR_SASLPLAIN_AUTHCID_IS_NULL_DN_153=The authentication ID in the SASL \
- PLAIN bind request appears to be an empty DN.  This is not allowed
+ PLAIN bind request appears to be an empty DN. This is not allowed
 ERR_SASLPLAIN_CANNOT_GET_ENTRY_BY_DN_154=An error occurred while \
  attempting to retrieve user entry %s as specified in the DN-based \
- authentication ID of a SASL PLAIN bind request:  %s
+ authentication ID of a SASL PLAIN bind request: %s
 ERR_SASLPLAIN_NO_MATCHING_ENTRIES_157=The server was not able to find \
  any user entries for the provided authentication ID of %s
 ERR_SASLPLAIN_INVALID_PASSWORD_160=The provided password is invalid
@@ -272,13 +272,13 @@
 ERR_SEDCM_CANNOT_LOCK_ENTRY_164=The Directory Server was unable to \
  obtain a read lock on user entry %s in order to retrieve that entry
 INFO_SASLANONYMOUS_TRACE_165=SASL ANONYMOUS bind operation (conn=%d, op=%d) \
- provided trace information:  %s
+ provided trace information: %s
 ERR_SASLCRAMMD5_CANNOT_GET_MESSAGE_DIGEST_166=An unexpected error \
  occurred while attempting to obtain an MD5 digest engine for use by the \
- CRAM-MD5 SASL handler:  %s
+ CRAM-MD5 SASL handler: %s
 ERR_SASLCRAMMD5_NO_STORED_CHALLENGE_172=The SASL CRAM-MD5 bind request \
  contained SASL credentials but there is no stored challenge for this client \
- connection.  The first CRAM-MD5 bind request in the two-stage process must \
+ connection. The first CRAM-MD5 bind request in the two-stage process must \
  not contain client SASL credentials
 ERR_SASLCRAMMD5_INVALID_STORED_CHALLENGE_173=The SASL CRAM-MD5 bind \
  request contained SASL credentials, but the stored SASL state information for \
@@ -292,17 +292,17 @@
  of an MD5 digest
 ERR_SASLCRAMMD5_INVALID_DIGEST_CONTENT_176=The SASL CRAM-MD5 bind \
  request included SASL credentials, but the decoded digest was not comprised \
- of only hexadecimal digits:  %s
+ of only hexadecimal digits: %s
 ERR_SASLCRAMMD5_CANNOT_DECODE_USERNAME_AS_DN_177=An error occurred while \
  attempting to decode the SASL CRAM-MD5 username "%s" because it appeared to \
- contain a DN but DN decoding failed:  %s
+ contain a DN but DN decoding failed: %s
 ERR_SASLCRAMMD5_USERNAME_IS_NULL_DN_178=The username in the SASL \
- CRAM-MD5 bind request appears to be an empty DN.  This is not allowed
+ CRAM-MD5 bind request appears to be an empty DN. This is not allowed
 INFO_SASLCRAMMD5_CANNOT_LOCK_ENTRY_179=The Directory Server was unable to \
  obtain a read lock on user entry %s in order to retrieve that entry
 ERR_SASLCRAMMD5_CANNOT_GET_ENTRY_BY_DN_180=An error occurred while \
  attempting to retrieve user entry %s as specified in the DN-based username of \
- a SASL CRAM-MD5 bind request:  %s
+ a SASL CRAM-MD5 bind request: %s
 ERR_SASLCRAMMD5_NO_MATCHING_ENTRIES_184=The server was not able to find \
  any user entries for the provided username of %s
 ERR_SASLCRAMMD5_INVALID_PASSWORD_188=The provided password is invalid
@@ -310,43 +310,43 @@
  is not possible for user %s because none of the passwords in the user entry \
  are stored in a reversible form
 INFO_SASL_UNSUPPORTED_CALLBACK_192=An unsupported or unexpected callback was \
- provided to the SASL server for use during %s authentication:  %s
+ provided to the SASL server for use during %s authentication: %s
 ERR_SASL_NO_CREDENTIALS_193=The client connection included \
  %s state information, indicating that the client was in the process \
  of performing a %s bind, but the bind request did not include any \
  credentials
 ERR_SASL_CANNOT_GET_SERVER_FQDN_194=An unexpected error occurred \
  while attempting to determine the value of the ds-cfg-server-fqdn attribute \
- in configuration entry %s:  %s
+ in configuration entry %s: %s
 ERR_SASL_CONTEXT_CREATE_ERROR_195=An unexpected error occurred while \
  trying to create an %s context: %s
 ERR_SASL_CANNOT_DECODE_USERNAME_AS_DN_196=An error occurred \
  while attempting to decode the SASL %s username "%s" because it \
- appeared to contain a DN but DN decoding failed:  %s
+ appeared to contain a DN but DN decoding failed: %s
 ERR_SASL_USERNAME_IS_NULL_DN_197=The username in the SASL \
- %s bind request appears to be an empty DN.  This is not allowed
+ %s bind request appears to be an empty DN. This is not allowed
 INFO_SASL_CANNOT_LOCK_ENTRY_198=The Directory Server was unable to \
  obtain a read lock on user entry %s in order to retrieve that entry
 ERR_SASL_CANNOT_GET_ENTRY_BY_DN_199=An error occurred while \
  attempting to retrieve user entry %s as specified in the DN-based username of \
- a SASL %s bind request:  %s
+ a SASL %s bind request: %s
 ERR_SASL_ZERO_LENGTH_USERNAME_200=The username contained in the \
  SASL %s bind request had a length of zero characters, which is not \
- allowed.  %s authentication does not allow an empty string for use as \
+ allowed. %s authentication does not allow an empty string for use as \
  the username
 ERR_SASL_NO_MATCHING_ENTRIES_201=The server was not able to \
  find any user entries for the provided username of %s
 ERR_SASL_AUTHZID_INVALID_DN_202=The provided authorization ID \
- %s contained an invalid DN:  %s
+ %s contained an invalid DN: %s
 ERR_SASL_AUTHZID_NO_SUCH_ENTRY_203=The entry %s specified as \
  the authorization identity does not exist
 ERR_SASL_AUTHZID_CANNOT_GET_ENTRY_204=The entry %s specified as \
- the authorization identity could not be retrieved:  %s
+ the authorization identity could not be retrieved: %s
 ERR_SASL_AUTHZID_NO_MAPPED_ENTRY_205=The server was unable to \
  find any entry corresponding to authorization ID %s
 ERR_SASL_CANNOT_GET_REVERSIBLE_PASSWORDS_207=An error occurred \
  while attempting to retrieve the clear-text password(s) for user %s in order \
- to perform SASL %s authentication:  %s
+ to perform SASL %s authentication: %s
 ERR_SASL_NO_REVERSIBLE_PASSWORDS_208=SASL %s \
  authentication is not possible for user %s because none of the passwords in \
  the user entry are stored in a reversible form
@@ -363,12 +363,12 @@
  because both the ds-cfg-kdc-address and ds-cfg-realm attributes must be \
  defined or neither defined
 ERR_SASL_CANNOT_MAP_AUTHENTRY_214=An error occurred while \
- attempting to map authorization ID %s to a user entry:  %s
+ attempting to map authorization ID %s to a user entry: %s
 ERR_SASLGSSAPI_CANNOT_CREATE_JAAS_CONFIG_215=An error occurred while \
  attempting to write a temporary JAAS configuration file for use during GSSAPI \
- processing:  %s
+ processing: %s
 ERR_SASLGSSAPI_CANNOT_CREATE_LOGIN_CONTEXT_216=An error occurred while \
- attempting to create the JAAS login context for GSSAPI authentication:  %s
+ attempting to create the JAAS login context for GSSAPI authentication: %s
 ERR_SASLGSSAPI_NO_CLIENT_CONNECTION_217=No client connection was \
  available for use in processing the GSSAPI bind request
 INFO_GSSAPI_PRINCIPAL_NAME_218=GSSAPI mechanism using a principal name of: %s
@@ -382,21 +382,21 @@
 ERR_EXACTMAP_MULTIPLE_MATCHING_ENTRIES_306=ID string %s mapped to \
  multiple users
 ERR_EXACTMAP_INEFFICIENT_SEARCH_307=The internal search based on ID \
- string %s could not be processed efficiently:  %s.  Check the server \
+ string %s could not be processed efficiently: %s. Check the server \
  configuration to ensure that all associated backends are properly configured \
  for these types of searches
 ERR_EXACTMAP_SEARCH_FAILED_308=An internal failure occurred while \
- attempting to resolve ID string %s to a user entry:  %s
+ attempting to resolve ID string %s to a user entry: %s
 ERR_SASLCRAMMD5_CANNOT_MAP_USERNAME_313=An error occurred while \
- attempting to map username %s to a Directory Server entry:  %s
+ attempting to map username %s to a Directory Server entry: %s
 ERR_SASLDIGESTMD5_CANNOT_MAP_USERNAME_319=An error occurred while \
- attempting to map username %s to a Directory Server entry:  %s
+ attempting to map username %s to a Directory Server entry: %s
 ERR_SASLPLAIN_CANNOT_MAP_USERNAME_325=An error occurred while attempting \
- to map username %s to a Directory Server entry:  %s
+ to map username %s to a Directory Server entry: %s
 ERR_EXTOP_CANCEL_NO_REQUEST_VALUE_327=Unable to process the cancel \
  request because the extended operation did not include a request value
 ERR_EXTOP_CANCEL_CANNOT_DECODE_REQUEST_VALUE_328=An error occurred while \
- attempting to decode the value of the cancel extended request:  %s
+ attempting to decode the value of the cancel extended request: %s
 INFO_EXTOP_CANCEL_REASON_329=Processing on this operation was terminated as a \
  result of receiving a cancel request (message ID %d)
 ERR_PWSCHEME_DOES_NOT_SUPPORT_AUTH_PASSWORD_330=Password storage scheme \
@@ -410,27 +410,27 @@
  the maximum allowed length of %d characters
 ERR_RANDOMPWGEN_NO_CHARSETS_341=Configuration entry "%s" does not \
  contain attribute ds-cfg-password-character-set which specifies the sets of \
- characters that should be used when generating the password.  This is a \
+ characters that should be used when generating the password. This is a \
  required attribute
 ERR_RANDOMPWGEN_CHARSET_NAME_CONFLICT_342=Configuration entry "%s" \
  contains multiple definitions for the %s character set
 ERR_RANDOMPWGEN_CANNOT_DETERMINE_CHARSETS_343=An error occurred while \
  attempting to decode the value(s) of the configuration attribute \
  ds-cfg-password-character-set, which is used to hold the character set(s) for \
- use in generating the password:  %s
+ use in generating the password: %s
 ERR_RANDOMPWGEN_UNKNOWN_CHARSET_346=The password format string "%s" \
  references an undefined character set "%s"
 ERR_RANDOMPWGEN_INVALID_PWFORMAT_347=The password format string "%s" \
- contains an invalid syntax.  This value should be a comma-delimited sequence \
+ contains an invalid syntax. This value should be a comma-delimited sequence \
  of elements, where each element is the name of a character set followed by a \
  colon and the number of characters to choose at random from that character \
  set
 ERR_RANDOMPWGEN_CANNOT_DETERMINE_PWFORMAT_348=An error occurred while \
  attempting to decode the value for configuration attribute \
  ds-cfg-password-format, which is used to specify the format for the generated \
- passwords:  %s
+ passwords: %s
 ERR_EXTOP_PASSMOD_CANNOT_GET_PW_POLICY_354=An error occurred while \
- attempting to get the password policy for user %s:  %s
+ attempting to get the password policy for user %s: %s
 ERR_EXTOP_PASSMOD_REQUIRE_CURRENT_PW_355=The current password must be \
  provided for self password changes
 ERR_EXTOP_PASSMOD_SECURE_AUTH_REQUIRED_356=Password modify operations \
@@ -448,36 +448,36 @@
  no password generator has been defined that may be used to automatically \
  create a new password
 ERR_EXTOP_PASSMOD_CANNOT_GENERATE_PW_362=An error occurred while \
- attempting to create a new password using the password generator:  %s
+ attempting to create a new password using the password generator: %s
 ERR_EXTOP_PASSMOD_PRE_ENCODED_NOT_ALLOWED_363=The password policy does \
  not allow users to supply pre-encoded passwords
 ERR_EXTOP_PASSMOD_UNACCEPTABLE_PW_364=The provided new password failed \
- the validation checks defined in the server:  %s
+ the validation checks defined in the server: %s
 ERR_EXTOP_PASSMOD_CANNOT_ENCODE_PASSWORD_365=Unable to encode the \
- provided password using the default scheme(s):  %s
+ provided password using the default scheme(s): %s
 ERR_EXTOP_PASSMOD_NO_SUCH_ID_MAPPER_368=The identity mapper with \
  configuration entry DN %s as specified for use with the password modify \
  extended operation defined in entry %s either does not exist or is not \
- enabled.  The identity mapper is a required component, and the password \
+ enabled. The identity mapper is a required component, and the password \
  modify extended operation will not be enabled
 ERR_EXTOP_PASSMOD_CANNOT_DETERMINE_ID_MAPPER_369=An error occurred while \
  attempting to determine the identity mapper to use in conjunction with the \
- password modify extended operation defined in configuration entry %s:  %s. \
+ password modify extended operation defined in configuration entry %s: %s. \
  The password modify extended operation will not be enabled for use in the \
  server
 ERR_EXTOP_PASSMOD_CANNOT_MAP_USER_370=The provided authorization ID \
  string "%s" could not be mapped to any user in the directory
 ERR_EXTOP_PASSMOD_ERROR_MAPPING_USER_371=An error occurred while \
- attempting to map authorization ID string "%s" to a user entry:  %s
+ attempting to map authorization ID string "%s" to a user entry: %s
 NOTE_ERRORLOG_ACCTNOTHANDLER_NOTIFICATION_375=Account-Status-Notification \
  type='%s' userdn='%s' id=%d msg='%s'
 
 ERR_SASLCRAMMD5_CANNOT_GET_REVERSIBLE_PASSWORDS_377=An error occurred \
  while attempting to retrieve the clear-text password(s) for user %s in order \
- to perform SASL CRAM-MD5 authentication:  %s
+ to perform SASL CRAM-MD5 authentication: %s
 ERR_SASLPLAIN_CANNOT_CHECK_PASSWORD_VALIDITY_378=An error occurred while \
  attempting to verify the password for user %s during SASL PLAIN \
- authentication:  %s
+ authentication: %s
 WARN_EXTOP_PASSMOD_NOOP_380=The password modify operation was not \
  actually performed in the Directory Server because the LDAP no-op control was \
  present in the request
@@ -488,7 +488,7 @@
  potential member of static group %s because that entry does not exist in the \
  Directory Server
 ERR_STATICMEMBERS_CANNOT_GET_ENTRY_384=An error occurred while \
- attempting to retrieve entry %s as a potential member of static group %s:  %s
+ attempting to retrieve entry %s as a potential member of static group %s: %s
 ERR_STATICGROUP_INVALID_OC_COMBINATION_385=Entry %s cannot be parsed as \
  a valid static group because static groups are not allowed to have both the \
  %s and %s object classes
@@ -496,7 +496,7 @@
  static group because it does not contain exactly one of the %s or the %s \
  object classes
 ERR_STATICGROUP_CANNOT_DECODE_MEMBER_VALUE_AS_DN_387=Value %s for \
- attribute %s in entry %s cannot be parsed as a valid DN:  %s.  It will be \
+ attribute %s in entry %s cannot be parsed as a valid DN: %s. It will be \
  excluded from the set of group members
 ERR_STATICGROUP_ADD_MEMBER_ALREADY_EXISTS_388=Cannot add user %s as a \
  new member of static group %s because that user is already in the member list \
@@ -506,36 +506,36 @@
  member list for the group
 ERR_STATICGROUP_ADD_MEMBER_UPDATE_FAILED_390=Cannot add user %s as a new \
  member of static group %s because an error occurred while attempting to \
- perform an internal modification to update the group:  %s
+ perform an internal modification to update the group: %s
 ERR_STATICGROUP_REMOVE_MEMBER_UPDATE_FAILED_391=Cannot remove user %s as \
  a member of static group %s because an error occurred while attempting to \
- perform an internal modification to update the group:  %s
+ perform an internal modification to update the group: %s
 ERR_EXTOP_PASSMOD_INSUFFICIENT_PRIVILEGES_392=You do not have sufficient \
  privileges to perform password reset operations
 ERR_SASLDIGESTMD5_EMPTY_AUTHZID_393=The provided authorization ID was \
  empty, which is not allowed for DIGEST-MD5 authentication
 ERR_SASLPLAIN_AUTHZID_INVALID_DN_400=The provided authorization ID %s \
- contained an invalid DN:  %s
+ contained an invalid DN: %s
 ERR_SASLPLAIN_AUTHZID_INSUFFICIENT_PRIVILEGES_401=The authenticating \
  user %s does not have sufficient privileges to specify an alternate \
  authorization ID
 ERR_SASLPLAIN_AUTHZID_NO_SUCH_ENTRY_402=The entry corresponding to \
  authorization DN %s does not exist in the Directory Server
 ERR_SASLPLAIN_AUTHZID_CANNOT_GET_ENTRY_403=An error occurred while \
- attempting to retrieve entry %s specified as the authorization ID:  %s
+ attempting to retrieve entry %s specified as the authorization ID: %s
 ERR_SASLPLAIN_AUTHZID_NO_MAPPED_ENTRY_404=No entry corresponding to \
  authorization ID %s was found in the server
 ERR_SASLPLAIN_AUTHZID_CANNOT_MAP_AUTHZID_405=An error occurred while \
- attempting to map authorization ID %s to a user entry:  %s
+ attempting to map authorization ID %s to a user entry: %s
 ERR_SDTUACM_NO_PEER_CERTIFICATE_417=Could not map the provided \
  certificate chain to a user entry because no peer certificate was available
 ERR_SDTUACM_PEER_CERT_NOT_X509_418=Could not map the provided \
  certificate chain to a user because the peer certificate was not an X.509 \
  certificate (peer certificate format was %s)
 ERR_SDTUACM_MULTIPLE_MATCHING_ENTRIES_419=The certificate with subject \
- %s could not be mapped to exactly one user.  It maps to both %s and %s
+ %s could not be mapped to exactly one user. It maps to both %s and %s
 ERR_SATUACM_INVALID_MAP_FORMAT_422=Configuration entry %s has value \
- '%s' which violates the format required for attribute mappings.  The expected \
+ '%s' which violates the format required for attribute mappings. The expected \
  format is 'certattr:userattr'
 ERR_SATUACM_DUPLICATE_CERT_ATTR_423=Configuration entry %s contains \
  multiple mappings for certificate attribute %s
@@ -549,11 +549,11 @@
  certificate chain to a user because the peer certificate was not an X.509 \
  certificate (peer certificate format was %s)
 ERR_SATUACM_CANNOT_DECODE_SUBJECT_AS_DN_431=Unable to decode peer \
- certificate subject %s as a DN:  %s
+ certificate subject %s as a DN: %s
 ERR_SATUACM_NO_MAPPABLE_ATTRIBUTES_432=Peer certificate subject %s \
  does not contain any attributes for which a mapping has been established
 ERR_SATUACM_MULTIPLE_MATCHING_ENTRIES_433=The certificate with subject \
- %s could not be mapped to exactly one user.  It maps to both %s and %s
+ %s could not be mapped to exactly one user. It maps to both %s and %s
 ERR_FCM_NO_PEER_CERTIFICATE_443=Could not map the provided certificate \
  chain to a user entry because no peer certificate was available
 ERR_FCM_PEER_CERT_NOT_X509_444=Could not map the provided certificate \
@@ -561,11 +561,11 @@
  (peer certificate format was %s)
 ERR_FCM_CANNOT_CALCULATE_FINGERPRINT_445=An error occurred while \
  attempting to calculate the fingerprint for the peer certificate with subject \
- %s:  %s
+ %s: %s
 ERR_FCM_MULTIPLE_MATCHING_ENTRIES_446=The certificate with fingerprint \
- %s could not be mapped to exactly one user.  It maps to both %s and %s
+ %s could not be mapped to exactly one user. It maps to both %s and %s
 ERR_DYNAMICGROUP_CANNOT_DECODE_MEMBERURL_447=Unable to decode value "%s" \
- in entry "%s" as an LDAP URL:  %s
+ in entry "%s" as an LDAP URL: %s
 ERR_DYNAMICGROUP_NESTING_NOT_SUPPORTED_448=Dynamic groups do not support \
  nested groups
 ERR_DYNAMICGROUP_ALTERING_MEMBERS_NOT_SUPPORTED_449=Dynamic groups do \
@@ -574,7 +574,7 @@
  dynamic group %s does not exist in the server
 ERR_DYNAMICGROUP_INTERNAL_SEARCH_FAILED_451=An error occurred while \
  attempting perform an internal search with base DN %s and filter %s to \
- resolve the member list for dynamic group %s:  result code %s, error message \
+ resolve the member list for dynamic group %s: result code %s, error message \
  %s
 ERR_DYNAMICGROUP_CANNOT_RETURN_ENTRY_452=The server encountered a \
  timeout while attempting to add user %s to the member list for dynamic group \
@@ -583,10 +583,10 @@
  less than the minimum required difference of %d characters
 ERR_REPEATEDCHARS_VALIDATOR_TOO_MANY_CONSECUTIVE_457=The provided \
  password contained too many instances of the same character appearing \
- consecutively.  The maximum number of times the same character may appear \
+ consecutively. The maximum number of times the same character may appear \
  consecutively in a password is %d
 ERR_UNIQUECHARS_VALIDATOR_NOT_ENOUGH_UNIQUE_CHARS_458=The provided \
- password does not contain enough unique characters.  The minimum number of \
+ password does not contain enough unique characters. The minimum number of \
  unique characters that may appear in a user password is %d
 ERR_VATTR_NOT_SEARCHABLE_459=The %s attribute is not \
  searchable and should not be included in otherwise unindexed search filters
@@ -595,13 +595,13 @@
 ERR_DICTIONARY_VALIDATOR_NO_SUCH_FILE_461=The specified dictionary file \
  %s does not exist
 ERR_DICTIONARY_VALIDATOR_CANNOT_READ_FILE_462=An error occurred while \
- attempting to load the dictionary from file %s:  %s
+ attempting to load the dictionary from file %s: %s
 ERR_ATTRVALUE_VALIDATOR_PASSWORD_IN_ENTRY_463=The provided password was \
  found in another attribute in the user entry
 ERR_CHARSET_VALIDATOR_ILLEGAL_CHARACTER_464=The provided password \
  contained character '%s' which is not allowed for use in passwords
 ERR_CHARSET_VALIDATOR_TOO_FEW_CHARS_FROM_SET_465=The provided password \
- did not contain enough characters from the character set '%s'.  The minimum \
+ did not contain enough characters from the character set '%s'. The minimum \
  number of characters from that set that must be present in user passwords is \
  %d
 ERR_CHARSET_VALIDATOR_NO_SET_COLON_466=The provided character set \
@@ -619,7 +619,7 @@
  defined in entry %s contains multiple target group DNs, but only one is \
  allowed
 ERR_VIRTUAL_STATIC_GROUP_CANNOT_DECODE_TARGET_471=Unable to decode "%s" \
- as the target DN for group %s:  %s
+ as the target DN for group %s: %s
 ERR_VIRTUAL_STATIC_GROUP_NO_TARGET_472=The virtual static group defined \
  in entry %s does not contain a target group definition
 ERR_VIRTUAL_STATIC_GROUP_NESTING_NOT_SUPPORTED_473=Virtual static groups \
@@ -637,7 +637,7 @@
 NOTE_FSCACHE_SAVE_485=Making the entry cache state persistent, this may \
  take awhile
 ERR_FSCACHE_CANNOT_INITIALIZE_486=A fatal error occurred while trying \
- to initialize file system entry cache:  %s
+ to initialize file system entry cache: %s
 ERR_FSCACHE_CANNOT_LOAD_PERSISTENT_DATA_487=An error occurred while \
  trying to load persistent cache. Persistent cache will be flushed now
 ERR_FSCACHE_CANNOT_STORE_PERSISTENT_DATA_488=An error occurred while \
@@ -653,7 +653,7 @@
  while trying to set the entry cache backend internal cache size in bytes. The \
  previous or default value will be used instead
 ERR_FSCACHE_CANNOT_SET_JE_PROPERTIES_493=Internal error occurred \
- while trying to set the entry cache backend Berkeley DB JE properties:  %s
+ while trying to set the entry cache backend Berkeley DB JE properties: %s
 ERR_FSCACHE_HOMELESS_494=A fatal error occurred while trying to setup \
  file system entry cache home. No suitable path can be found to host the cache \
  home
@@ -676,79 +676,79 @@
 ERR_PWPSTATE_EXTOP_NO_REQUEST_VALUE_503=The provided password policy \
  state extended request did not include a request value
 ERR_PWPSTATE_EXTOP_DECODE_FAILURE_504=An unexpected error occurred \
- while attempting to decode password policy state extended request value:  %s
+ while attempting to decode password policy state extended request value: %s
 ERR_PWPSTATE_EXTOP_MULTIPLE_ENTRIES_505=Multiple entries were found \
  with DN %s
 ERR_PWPSTATE_EXTOP_INVALID_OP_ENCODING_506=An unexpected error \
  occurred while attempting to decode an operation from the password policy \
- state extended request:  %s
+ state extended request: %s
 ERR_PWPSTATE_EXTOP_NO_DISABLED_VALUE_507=No value was provided for the \
  password policy state operation intended to set the disabled state for the \
- user.  Exactly one value (either 'true' or 'false') must be given
+ user. Exactly one value (either 'true' or 'false') must be given
 ERR_PWPSTATE_EXTOP_BAD_DISABLED_VALUE_COUNT_508=Multiple values were \
  provided for the password policy state operation intended to set the disabled \
- state for the user.  Exactly one value (either 'true' or 'false') must be \
+ state for the user. Exactly one value (either 'true' or 'false') must be \
  given
 ERR_PWPSTATE_EXTOP_BAD_DISABLED_VALUE_509=The value provided for the \
- password policy state operation  intended to set the disabled state for the \
- user was invalid.  The value must be either 'true' or 'false'
+ password policy state operation intended to set the disabled state for the \
+ user was invalid. The value must be either 'true' or 'false'
 ERR_PWPSTATE_EXTOP_BAD_ACCT_EXP_VALUE_COUNT_510=Multiple values were \
  provided for the password policy state operation intended to set the account \
- expiration time for the user.  Exactly one value must be given
+ expiration time for the user. Exactly one value must be given
 ERR_PWPSTATE_EXTOP_BAD_ACCT_EXP_VALUE_511=The value %s provided for \
  the password policy state operation used to set the account expiration time \
- was invalid:  %s.  The value should be specified using the generalized time \
+ was invalid: %s. The value should be specified using the generalized time \
  format
 ERR_PWPSTATE_EXTOP_BAD_PWCHANGETIME_VALUE_COUNT_512=Multiple values \
  were provided for the password policy state operation intended to set the \
- password changed time for the user.  Exactly one value must be given
+ password changed time for the user. Exactly one value must be given
 ERR_PWPSTATE_EXTOP_BAD_PWCHANGETIME_VALUE_513=The value %s provided \
  for the password policy state operation used to set the password changed time \
- was invalid:  %s.  The value should be specified using the generalized time \
+ was invalid: %s. The value should be specified using the generalized time \
  format
 ERR_PWPSTATE_EXTOP_BAD_PWWARNEDTIME_VALUE_COUNT_514=Multiple values \
  were provided for the password policy state operation intended to set the \
- password warned time for the user.  Exactly one value must be given
+ password warned time for the user. Exactly one value must be given
 ERR_PWPSTATE_EXTOP_BAD_PWWARNEDTIME_VALUE_515=The value %s provided \
  for the password policy state operation used to set the password warned time \
- was invalid:  %s.  The value should be specified using the generalized time \
+ was invalid: %s. The value should be specified using the generalized time \
  format
 ERR_PWPSTATE_EXTOP_BAD_ADD_FAILURE_TIME_COUNT_516=Multiple values were \
  provided for the password policy state operation intended to add an \
- authentication failure time for the user.  Exactly one value must be given
+ authentication failure time for the user. Exactly one value must be given
 ERR_PWPSTATE_EXTOP_BAD_AUTH_FAILURE_TIME_517=The value %s provided for \
  the password policy state operation used to update the authentication failure \
- times was invalid:  %s.  The value should be specified using the generalized \
+ times was invalid: %s. The value should be specified using the generalized \
  time format
 ERR_PWPSTATE_EXTOP_BAD_LAST_LOGIN_TIME_COUNT_518=Multiple values were \
  provided for the password policy state operation intended to set the last \
- login time for the user.  Exactly one value must be given
+ login time for the user. Exactly one value must be given
 ERR_PWPSTATE_EXTOP_BAD_LAST_LOGIN_TIME_519=The value %s provided for \
  the password policy state operation used to set the last login time was \
- invalid:  %s.  The value should be specified using the generalized time format
+ invalid: %s. The value should be specified using the generalized time format
 ERR_PWPSTATE_EXTOP_NO_RESET_STATE_VALUE_520=No value was provided for \
  the password policy state operation intended to set the reset state for the \
- user.  Exactly one value (either 'true' or 'false') must be given
+ user. Exactly one value (either 'true' or 'false') must be given
 ERR_PWPSTATE_EXTOP_BAD_RESET_STATE_VALUE_COUNT_521=Multiple values \
  were provided for the password policy state operation intended to set the \
- reset state for the user.  Exactly one value (either 'true' or 'false') must \
+ reset state for the user. Exactly one value (either 'true' or 'false') must \
  be given
 ERR_PWPSTATE_EXTOP_BAD_RESET_STATE_VALUE_522=The value provided for \
- the password policy state operation  intended to set the reset state for the \
- user was invalid.  The value must be either 'true' or 'false'
+ the password policy state operation intended to set the reset state for the \
+ user was invalid. The value must be either 'true' or 'false'
 ERR_PWPSTATE_EXTOP_BAD_ADD_GRACE_LOGIN_TIME_COUNT_523=Multiple values \
  were provided for the password policy state operation intended to add a grace \
- login use time for the user.  Exactly one value must be given
+ login use time for the user. Exactly one value must be given
 ERR_PWPSTATE_EXTOP_BAD_GRACE_LOGIN_TIME_524=The value %s provided for \
  the password policy state operation used to update the grace login use times \
- was invalid:  %s.  The value should be specified using the generalized time \
+ was invalid: %s. The value should be specified using the generalized time \
  format
 ERR_PWPSTATE_EXTOP_BAD_REQUIRED_CHANGE_TIME_COUNT_525=Multiple values \
  were provided for the password policy state operation intended to set the \
- required change time for the user.  Exactly one value must be given
+ required change time for the user. Exactly one value must be given
 ERR_PWPSTATE_EXTOP_BAD_REQUIRED_CHANGE_TIME_526=The value %s provided \
  for the password policy state operation used to set the required change time \
- was invalid:  %s.  The value should be specified using the generalized time \
+ was invalid: %s. The value should be specified using the generalized time \
  format
 ERR_PWPSTATE_EXTOP_UNKNOWN_OP_TYPE_527=The password policy state \
  extended request included an operation with an invalid or unsupported \
@@ -760,22 +760,22 @@
 ERR_EXTOP_PASSMOD_PW_IN_HISTORY_530=The provided new password was \
  already contained in the password history
 ERR_SMTPALERTHANDLER_NO_SMTP_SERVERS_531=The Directory Server is not \
- configured with any SMTP servers.  The SMTP alert handler cannot be used \
+ configured with any SMTP servers. The SMTP alert handler cannot be used \
  unless the Directory Server is configured with information about at least one \
  SMTP server
 WARN_SMTPALERTHANDLER_ERROR_SENDING_MESSAGE_532=An error occurred when \
  trying to send an e-mail message for administrative alert with type %s and \
- message %s:  %s
+ message %s: %s
 ERR_REGEXMAP_INVALID_MATCH_PATTERN_533=The provided match pattern "%s" \
- could not be parsed as a regular expression:  %s
+ could not be parsed as a regular expression: %s
 ERR_REGEXMAP_MULTIPLE_MATCHING_ENTRIES_535=The processed ID string %s \
  mapped to multiple users
 ERR_REGEXMAP_INEFFICIENT_SEARCH_536=The internal search based on \
- processed ID string %s could not be processed efficiently:  %s.  Check the \
+ processed ID string %s could not be processed efficiently: %s. Check the \
  server configuration to ensure that all associated backends are properly \
  configured for these types of searches
 ERR_REGEXMAP_SEARCH_FAILED_537=An internal failure occurred while \
- attempting to resolve processed ID string %s to a user entry:  %s
+ attempting to resolve processed ID string %s to a user entry: %s
 ERR_STATICGROUP_ADD_NESTED_GROUP_ALREADY_EXISTS_538=Cannot add group %s \
  as a new nested group of static group %s because that group is already in the \
  nested group list for the group
@@ -793,7 +793,7 @@
  unless the Directory Server is with information about one or more SMTP servers
 ERR_SMTP_ASNH_NO_RECIPIENTS_544=SMTP account status notification handler \
  configuration entry '%s' does not include any email address attribute types \
- or recipient addresses.  At least one of these must be provided
+ or recipient addresses. At least one of these must be provided
 ERR_SMTP_ASNH_SUBJECT_NO_COLON_545=Unable to parse message subject value \
  '%s' from configuration entry '%s' because the value does not contain a \
  colon to separate the notification type from the subject
@@ -827,15 +827,15 @@
  was found at column %d of line %d
 ERR_SMTP_ASNH_TEMPLATE_CANNOT_PARSE_556=An error occurred while \
  attempting to parse message template file '%s' referenced in configuration \
- entry '%s':  %s
+ entry '%s': %s
 INFO_SMTP_ASNH_DEFAULT_SUBJECT_557=Directory Account Status Notification
 ERR_SMTP_ASNH_CANNOT_SEND_MESSAGE_558=An error occurred while \
  attempting to send an account status notification message for notification \
- type %s for user entry %s:  %s
+ type %s for user entry %s: %s
 ERR_PWSCHEME_CANNOT_ENCRYPT_559=An error occurred while trying to \
- encrypt a value using password storage scheme %s:  %s
+ encrypt a value using password storage scheme %s: %s
 ERR_PWSCHEME_CANNOT_DECRYPT_560=An error occurred while trying to \
- decrypt a value using password storage scheme %s:  %s
+ decrypt a value using password storage scheme %s: %s
 ERR_GET_SYMMETRIC_KEY_NO_VALUE_561=Cannot decode the provided \
  symmetric key extended operation because it does not have a value
 ERR_GET_SYMMETRIC_KEY_ASN1_DECODE_EXCEPTION_563=Cannot decode the \
@@ -878,7 +878,7 @@
  password did not contain characters from at least %d of the following \
  character sets or ranges: %s
 ERR_STATICMEMBERS_CANNOT_DECODE_DN_582=An error occurred while \
- attempting to decode member's DN %s of static group %s:  %s
+ attempting to decode member's DN %s of static group %s: %s
 ERR_SASL_ACCOUNT_NOT_LOCAL_583=SASL %s authentication \
  is not supported for user %s because the account is not managed locally
 ERR_EXTOP_PASSMOD_ACCOUNT_NOT_LOCAL_584=Password modification is not \
@@ -961,7 +961,7 @@
  bind password does not exist
 ERR_LDAP_PTA_PWD_FILE_CANNOT_READ_610=The configuration of LDAP PTA policy \
  "%s" is invalid because the file %s which should contain the mapped search \
- bind password cannot be read for the following reason:  %s
+ bind password cannot be read for the following reason: %s
 ERR_LDAP_PTA_PWD_FILE_EMPTY_611=The configuration of LDAP PTA policy \
  "%s" is invalid because the file %s which should contain the mapped search \
  bind password is empty
@@ -975,27 +975,27 @@
 ERR_SATUACM_MULTIPLE_SEARCH_MATCHING_ENTRIES_616=The certificate with \
  subject %s mapped to multiple users
 ERR_SATUACM_INEFFICIENT_SEARCH_617=The internal search based on \
- the certificate with subject %s could not be processed efficiently:  %s.  \
+ the certificate with subject %s could not be processed efficiently: %s. \
  Check the server configuration to ensure that all associated backends are \
  properly configured for these types of searches
 ERR_SATUACM_SEARCH_FAILED_618=An internal failure occurred while \
- attempting to map the certificate with subject %s to a user entry:  %s
+ attempting to map the certificate with subject %s to a user entry: %s
 ERR_SDTUACM_MULTIPLE_SEARCH_MATCHING_ENTRIES_619=The certificate with \
  subject %s mapped to multiple users
 ERR_SDTUACM_INEFFICIENT_SEARCH_620=The internal search based on \
- the certificate with subject %s could not be processed efficiently:  %s.  \
+ the certificate with subject %s could not be processed efficiently: %s. \
  Check the server configuration to ensure that all associated backends are \
  properly configured for these types of searches
 ERR_SDTUACM_SEARCH_FAILED_621=An internal failure occurred while \
- attempting to map the certificate with subject %s to a user entry:  %s
+ attempting to map the certificate with subject %s to a user entry: %s
 ERR_FCM_MULTIPLE_SEARCH_MATCHING_ENTRIES_622=The certificate with \
  fingerprint %s mapped to multiple users
 ERR_FCM_INEFFICIENT_SEARCH_623=The internal search based on \
- the certificate with fingerprint %s could not be processed efficiently:  %s.  \
+ the certificate with fingerprint %s could not be processed efficiently: %s. \
  Check the server configuration to ensure that all associated backends are \
  properly configured for these types of searches
 ERR_FCM_SEARCH_FAILED_624=An internal failure occurred while \
- attempting to map the certificate with fingerprint %s to a user entry:  %s
+ attempting to map the certificate with fingerprint %s to a user entry: %s
 ERR_FIRSTCHANGENUMBER_VATTR_NOT_SEARCHABLE_625=The %s attribute is not \
  searchable and should not be included in otherwise unindexed search filters
 ERR_LASTCHANGENUMBER_VATTR_NOT_SEARCHABLE_626=The %s attribute is not \
@@ -1005,14 +1005,14 @@
 ERR_CHANGELOGBASEDN_VATTR_NOT_SEARCHABLE_628=The %s attribute is not \
  searchable and should not be included in otherwise unindexed search filters
 ERR_CHARSET_VALIDATOR_TOO_FEW_CHARS_FROM_RANGE_629=The provided password \
- did not contain enough characters from the character range '%s'.  The minimum \
+ did not contain enough characters from the character range '%s'. The minimum \
  number of characters from that range that must be present in user passwords \
  is %d
 ERR_CHARSET_VALIDATOR_NO_RANGE_COLON_630=The provided character range \
- definition  '%s' is invalid because it does not contain a colon to separate \
+ definition '%s' is invalid because it does not contain a colon to separate \
  the minimum count from the character range
 ERR_CHARSET_VALIDATOR_NO_RANGE_CHARS_631=The provided character range \
- definition  '%s' is invalid because it does not contain a colon to separate \
+ definition '%s' is invalid because it does not contain a colon to separate \
  the minimum count from the character range
 ERR_CHARSET_VALIDATOR_INVALID_RANGE_COUNT_632=The provided character \
  range definition '%s' is invalid because the value before the colon must be \
diff --git a/opendj3-server-dev/src/messages/messages/jeb.properties b/opendj3-server-dev/src/messages/messages/jeb.properties
index 65e2490..a684987 100644
--- a/opendj3-server-dev/src/messages/messages/jeb.properties
+++ b/opendj3-server-dev/src/messages/messages/jeb.properties
@@ -111,26 +111,26 @@
 NOTE_JEB_CACHE_SIZE_AFTER_PRELOAD_61=The database cache is %d MB after \
  pre-loading
 ERR_JEB_CACHE_PRELOAD_62=An error occurred while preloading the \
- database cache for backend %s:  %s
+ database cache for backend %s: %s
 ERR_JEB_BACKUP_CANNOT_GET_MAC_63=An error occurred while attempting to \
- obtain the %s MAC provider to create the signed hash for the backup:  %s
+ obtain the %s MAC provider to create the signed hash for the backup: %s
 ERR_JEB_BACKUP_CANNOT_GET_DIGEST_64=An error occurred while attempting \
- to obtain the %s message digest to create the hash for the backup:  %s
+ to obtain the %s message digest to create the hash for the backup: %s
 ERR_JEB_BACKUP_CANNOT_CREATE_ARCHIVE_FILE_65=An error occurred while \
- trying to create the database archive file %s in directory %s:  %s
+ trying to create the database archive file %s in directory %s: %s
 ERR_JEB_BACKUP_CANNOT_GET_CIPHER_66=An error occurred while attempting \
- to obtain the cipher to use to encrypt the backup:  %s
+ to obtain the cipher to use to encrypt the backup: %s
 ERR_JEB_BACKUP_ZIP_COMMENT_67=%s backup %s of backend %s
 ERR_JEB_BACKUP_CANNOT_LIST_LOG_FILES_68=An error occurred while \
  attempting to obtain a list of the files in directory %s to include in the \
- database backup:  %s
+ database backup: %s
 ERR_JEB_BACKUP_CANNOT_WRITE_ARCHIVE_FILE_69=An error occurred while \
- attempting to back up database file %s:  %s
+ attempting to back up database file %s: %s
 ERR_JEB_BACKUP_CANNOT_CLOSE_ZIP_STREAM_70=An error occurred while \
- trying to close the database archive file %s in directory %s:  %s
+ trying to close the database archive file %s in directory %s: %s
 ERR_JEB_BACKUP_CANNOT_UPDATE_BACKUP_DESCRIPTOR_71=An error occurred \
  while attempting to update the backup descriptor file %s with information \
- about the database backup:  %s
+ about the database backup: %s
 ERR_JEB_BACKUP_UNSIGNED_HASH_ERROR_72=The computed hash of backup %s \
  is different to the value computed at time of backup
 ERR_JEB_BACKUP_SIGNED_HASH_ERROR_73=The computed signed hash of backup \
@@ -213,7 +213,7 @@
 ERR_JEB_REBUILD_BACKEND_ONLINE_138=Rebuilding system index(es) must be \
  done with the backend containing the base DN disabled
 ERR_ENTRYIDSORTER_CANNOT_EXAMINE_ENTRY_139=Unable to examine the entry \
- with ID %s for sorting purposes:  %s
+ with ID %s for sorting purposes: %s
 ERR_JEB_SEARCH_CANNOT_SORT_UNINDEXED_140=The search results cannot be \
  sorted because the given search request is not indexed
 ERR_ENTRYIDSORTER_NEGATIVE_START_POS_141=Unable to process the virtual \
@@ -221,7 +221,7 @@
  of the result set
 ERR_JEB_SEARCH_CANNOT_MIX_PAGEDRESULTS_AND_VLV_144=The requested search \
  operation included both the simple paged results control and the virtual list \
- view control.  These controls are mutually exclusive and cannot be used \
+ view control. These controls are mutually exclusive and cannot be used \
  together
 ERR_JEB_SEARCH_UNINDEXED_INSUFFICIENT_PRIVILEGES_145=You do not have \
  sufficient privileges to perform an unindexed search
@@ -244,8 +244,8 @@
 ERR_JEB_IMPORT_CREATE_TMPDIR_ERROR_155=Unable to create the temporary \
  directory %s
 ERR_JEB_INVALID_LOGGING_LEVEL_156=The database logging level string \
- '%s' provided for configuration entry '%s' is invalid.  The value must be one \
- of OFF, SEVERE, WARNING, INFO, CONFIG, FINE, FINER, FINEST, or ALL.  Note \
+ '%s' provided for configuration entry '%s' is invalid. The value must be one \
+ of OFF, SEVERE, WARNING, INFO, CONFIG, FINE, FINER, FINEST, or ALL. Note \
  that these values are case sensitive
 NOTE_JEB_IMPORT_MIGRATION_START_157=Migrating %s entries for base DN %s
 ERR_JEB_CONFIG_VLV_INDEX_UNDEFINED_ATTR_160=Sort attribute %s for VLV \
@@ -260,33 +260,33 @@
 ERR_JEB_MODIFYDN_ABORTED_BY_SUBORDINATE_SCHEMA_ERROR_164=A plugin caused \
  the modify DN operation to be aborted while moving and/or renaming an entry \
  from %s to %s because the change to that entry violated the server schema \
- configuration:  %s
+ configuration: %s
 ERR_JEB_COMPSCHEMA_CANNOT_DECODE_OC_TOKEN_165=An error occurred while \
  attempting to decode an object class set token from the JE compressed \
- schema definitions:  %s
+ schema definitions: %s
 ERR_JEB_COMPSCHEMA_CANNOT_DECODE_AD_TOKEN_166=An error occurred while \
  attempting to decode an attribute description token from the JE compressed \
- schema definitions:  %s
+ schema definitions: %s
 ERR_JEB_COMPSCHEMA_CANNOT_STORE_STATUS_167=An error occurred while \
- attempting to store compressed schema information in the database.  The \
- result returned was:  %s
+ attempting to store compressed schema information in the database. The \
+ result returned was: %s
 ERR_JEB_COMPSCHEMA_CANNOT_STORE_EX_168=An error occurred while \
- attempting to store compressed schema information in the database:  %s
+ attempting to store compressed schema information in the database: %s
 ERR_JEB_COMPSCHEMA_CANNOT_STORE_MULTIPLE_FAILURES_169=The server was \
  unable to store compressed schema information in the database after multiple \
  attempts
 NOTE_JEB_CONFIG_DB_DIR_REQUIRES_RESTART_172=The change to the DB directory \
-  will not take effect until the backend is restarted. The DB files from the \
-  previous directory %s must be moved to the new directory %s after shutting \
-  down the backend to retain the existing data
+ will not take effect until the backend is restarted. The DB files from the \
+ previous directory %s must be moved to the new directory %s after shutting \
+ down the backend to retain the existing data
 NOTE_JEB_IMPORT_STARTING_173=%s starting import (build %s, R%d)
 ERR_JEB_DIRECTORY_DOES_NOT_EXIST_174=The backend database directory \
  '%s' does not exist
 ERR_JEB_IMPORT_LDIF_INDEX_FILEWRITER_ERR_175=The following I/O \
 error was received while writing the %s index scratch file in the temporary \
-  directory: %s
+ directory: %s
 NOTE_JEB_IMPORT_LDIF_ROOTCONTAINER_CLOSE_176=Import LDIF environment close \
-  took %d seconds
+ took %d seconds
 NOTE_JEB_IMPORT_LDIF_DN_CLOSE_178=DN phase two processing completed. \
 Processed %d DNs
 NOTE_JEB_IMPORT_LDIF_INDEX_CLOSE_179=Index %s phase two processing completed
@@ -301,21 +301,21 @@
 %d buffers
 NOTE_JEB_IMPORT_LDIF_BUFFER_CHECKPOINTS_187=Checkpoints performed: %d
 NOTE_JEB_IMPORT_LDIF_CLEANER_STATS_188=Cleaner runs: %d files deleted: %d \
-  entries read: %d IN nodes cleaned: %d
+ entries read: %d IN nodes cleaned: %d
 NOTE_JEB_IMPORT_LDIF_EVICTION_DETECTED_STATS_189=Eviction in progress. Passes: \
-  %d nodes evicted: %d BIN nodes stripped: %d
+ %d nodes evicted: %d BIN nodes stripped: %d
 NOTE_JEB_IMPORT_LDIF_EVICTION_DETECTED_190=Eviction detected after importing \
-  %d entries
+ %d entries
 WARN_BACKUPDB_INCREMENTAL_NOT_FOUND_DOING_NORMAL_191=Could not find any \
- backup in '%s'.  A full backup will be executed
+ backup in '%s'. A full backup will be executed
 ERR_CONFIG_INDEX_TYPE_NEEDS_VALID_MATCHING_RULE_192=The attribute '%s' \
 cannot have extensible index type for invalid matching rule name '%s'
 ERR_CONFIG_JEB_CACHE_SIZE_GREATER_THAN_JVM_HEAP_193=Configuration \
-  attribute ds-cfg-db-cache-size has a value of %d but the JVM is only \
-  configured for %d. Consider using ds-cfg-db-cache-percent
+ attribute ds-cfg-db-cache-size has a value of %d but the JVM is only \
+ configured for %d. Consider using ds-cfg-db-cache-percent
 ERR_CONFIG_JEB_CACHE_SIZE_TOO_SMALL_194=Configuration \
-  attribute ds-cfg-db-cache-size has a value of %d which is less than \
-  the minimum: %d
+ attribute ds-cfg-db-cache-size has a value of %d which is less than \
+ the minimum: %d
 ERR_JEB_DELETE_ABORTED_BY_SUBORDINATE_PLUGIN_195=A plugin caused the \
  delete operation to be aborted while deleting a subordinate entry %s
 NOTE_JEB_IMPORT_LDIF_PHASE_TWO_MEM_REPORT_196=The available memory for phase \
@@ -353,45 +353,45 @@
 used to %d
 ERR_JEB_EXPORT_IO_ERROR_214=I/O error occurred while exporting entry: %s
 ERR_JEB_IMPORT_LDIF_READER_IO_ERROR_215=I/O error occurred while opening \
-  the LDIF stream
+ the LDIF stream
 ERR_JEB_IMPORT_BUFFER_IO_ERROR_216=I/O error occurred while reading \
-  the index scratch file %s in the temporary directory
+ the index scratch file %s in the temporary directory
 ERR_JEB_DISK_LOW_THRESHOLD_REACHED_217=The disk containing directory %s \
-  used by the database backend %s is low on free space (%d bytes free). \
-  Write operations to the backend are only permitted by a user with the \
-  BYPASS_LOCKDOWN privilege until the free space rises above the threshold \
-  (%d bytes)
+ used by the database backend %s is low on free space (%d bytes free). \
+ Write operations to the backend are only permitted by a user with the \
+ BYPASS_LOCKDOWN privilege until the free space rises above the threshold \
+ (%d bytes)
 ERR_JEB_DISK_FULL_THRESHOLD_REACHED_218=The disk containing directory \
-  %s used by the database backend %s is full (%d bytes free). Write operations \
-  to the backend will fail until the free space rises above the threshold \
-  (%d bytes)
+ %s used by the database backend %s is full (%d bytes free). Write operations \
+ to the backend will fail until the free space rises above the threshold \
+ (%d bytes)
 NOTE_JEB_DISK_SPACE_RESTORED_219=The free space (%d bytes) on the disk \
-  containing directory %s used by the database backend %s is now above the \
-  threshold (%d bytes)
+ containing directory %s used by the database backend %s is now above the \
+ threshold (%d bytes)
 WARN_JEB_OUT_OF_DISK_SPACE_220=There is not enough space on the disk \
-  for the database to perform the write operation
+ for the database to perform the write operation
 WARN_IMPORT_LDIF_LACK_MEM_PHASE_TWO_221=Insufficient free memory (%d bytes) to \
  perform import phase 2 in a single batch. Some indexes will be imported using \
  several batches which may result in reduced performance
 ERR_IMPORT_LDIF_LACK_DISK_PHASE_ONE_222=The disk containing directory \
-  %s is full (%d bytes free). After freeing more than %d bytes on the disk, \
-  import can continue in append and replace mode to load the rest of the \
-  entries
+ %s is full (%d bytes free). After freeing more than %d bytes on the disk, \
+ import can continue in append and replace mode to load the rest of the \
+ entries
 ERR_IMPORT_LDIF_LACK_DISK_PHASE_TWO_223=The disk containing directory \
-  %s is full (%d bytes free). After freeing more than %d bytes on the disk, \
-  a rebuild of all the indexes is needed to complete the import
+ %s is full (%d bytes free). After freeing more than %d bytes on the disk, \
+ a rebuild of all the indexes is needed to complete the import
 ERR_REBUILD_INDEX_LACK_DISK_224=The disk containing directory \
-  %s is full (%d bytes free). Rebuild index can not continue until the free \
-  space rises above the threshold (%d bytes)
+ %s is full (%d bytes free). Rebuild index can not continue until the free \
+ space rises above the threshold (%d bytes)
 INFO_JEB_INDEX_FILTER_INDEX_TYPE_DISABLED_225=%s index type is disabled for \
-  the %s attribute
+ the %s attribute
 INFO_JEB_INDEX_FILTER_INDEX_NOT_TRUSTED_226=%s index is invalid and needs to \
-  be rebuilt
+ be rebuilt
 INFO_JEB_INDEX_FILTER_INDEX_REBUILD_IN_PROGRESS_227=%s index is being rebuilt
 INFO_JEB_INDEX_FILTER_INDEX_LIMIT_EXCEEDED_228=The filter value exceeded the \
-  index entry limit for the %s index
+ index entry limit for the %s index
 INFO_JEB_INDEX_FILTER_MATCHING_RULE_NOT_INDEXED_229=Matching rule %s is \
-  disabled for the extensible index of the %s attribute
+ disabled for the extensible index of the %s attribute
 NOTE_JEB_SUBORDINATE_INDEXES_DISABLED_230=The subordinate indexes have been \
  disabled for database backend %s
 NOTE_JEB_REBUILD_DEGRADED_START_231=Rebuild of all degraded indexes started \
diff --git a/opendj3-server-dev/src/messages/messages/log.properties b/opendj3-server-dev/src/messages/messages/log.properties
index b45178a..5af0b36 100644
--- a/opendj3-server-dev/src/messages/messages/log.properties
+++ b/opendj3-server-dev/src/messages/messages/log.properties
@@ -63,8 +63,8 @@
 WARN_LOGGER_UNABLE_SET_PERMISSIONS_9=This platform does not support \
  setting file permissions %s to the log file %s
 ERR_LOGGER_ERROR_LISTING_FILES_10=Error occured while listing log files \
-  named by policy with initial file name %s
+ named by policy with initial file name %s
 ERR_LOGGER_ERROR_OBTAINING_FREE_SPACE_11=Error occured while obtaining \
-  free disk space in the partition containing log file %s: %s
+ free disk space in the partition containing log file %s: %s
 ERR_LOGGER_ERROR_ENFORCING_RETENTION_POLICY_12=Error occured while \
-  enforcing retention policy %s for logger %s: %s
+ enforcing retention policy %s for logger %s: %s
diff --git a/opendj3-server-dev/src/messages/messages/plugin.properties b/opendj3-server-dev/src/messages/messages/plugin.properties
index 8a091d2..dd878a3 100644
--- a/opendj3-server-dev/src/messages/messages/plugin.properties
+++ b/opendj3-server-dev/src/messages/messages/plugin.properties
@@ -20,6 +20,7 @@
 # CDDL HEADER END
 #
 #      Copyright 2006-2010 Sun Microsystems, Inc.
+#      Portions Copyright 2014 ForgeRock AS
 
 
 
@@ -48,20 +49,20 @@
 #
 ERR_PLUGIN_ADLIST_NO_PLUGIN_TYPES_3=The LDAP attribute description \
  list plugin instance defined in configuration entry %s does not list any \
- plugin types.  This plugin must be configured to operate as a pre-parse \
+ plugin types. This plugin must be configured to operate as a pre-parse \
  search plugin
 ERR_PLUGIN_ADLIST_INVALID_PLUGIN_TYPE_4=The LDAP attribute description \
  list plugin instance defined in configuration entry %s lists an invalid \
- plugin type %s.  This plugin can only be used as a pre-parse search plugin
+ plugin type %s. This plugin can only be used as a pre-parse search plugin
 ERR_PLUGIN_PROFILER_NO_PLUGIN_TYPES_5=The Directory Server profiler \
  plugin instance defined in configuration entry %s does not list any plugin \
- types.  This plugin must be configured to operate as a startup plugin
+ types. This plugin must be configured to operate as a startup plugin
 ERR_PLUGIN_PROFILER_INVALID_PLUGIN_TYPE_6=The Directory Server \
  profiler plugin instance defined in configuration entry %s lists an invalid \
- plugin type %s.  This plugin can only be used as a startup plugin
+ plugin type %s. This plugin can only be used as a startup plugin
 ERR_PLUGIN_PROFILER_CANNOT_WRITE_PROFILE_DATA_9=An unexpected error \
  occurred when the profiler plugin defined in configuration entry %s attempted \
- to write the information captured to output file %s:  %s
+ to write the information captured to output file %s: %s
 WARN_PLUGIN_PROFILER_INVALID_PROFILE_DIR_16=The profile directory %s \
  specified in attribute ds-cfg-profile-directory of configuration entry %s is \
  invalid because the specified path does not exist or is not a directory
@@ -79,125 +80,125 @@
  plugin defined in configuration entry %s has been written to %s
 ERR_PLUGIN_STARTUP_PLUGIN_EXCEPTION_30=The startup plugin defined in \
  configuration entry %s threw an exception when it was invoked during the \
- Directory Server startup process:  %s.  The server startup process has been \
+ Directory Server startup process: %s. The server startup process has been \
  aborted
 ERR_PLUGIN_STARTUP_PLUGIN_RETURNED_NULL_31=The startup plugin defined \
  in configuration entry %s returned a null value when it was invoked during \
- the Directory Server startup process.  This is an illegal return value, and \
+ the Directory Server startup process. This is an illegal return value, and \
  the server startup process has been aborted
 ERR_PLUGIN_STARTUP_PLUGIN_FAIL_ABORT_33=The startup plugin defined in \
  configuration entry %s encountered an error when it was invoked during the \
- Directory Server startup process:  %s (error ID %d).  The server startup \
+ Directory Server startup process: %s (error ID %d). The server startup \
  process has been aborted
 ERR_PLUGIN_SHUTDOWN_PLUGIN_EXCEPTION_34=The shutdown plugin defined in \
  configuration entry %s threw an exception when it was invoked during the \
- Directory Server shutdown process:  %s
+ Directory Server shutdown process: %s
 ERR_PLUGIN_POST_CONNECT_PLUGIN_EXCEPTION_35=The post-connect plugin \
  defined in configuration entry %s threw an exception when it was invoked for \
- connection %d from %s:  %s.  The connection will be terminated
+ connection %d from %s: %s. The connection will be terminated
 ERR_PLUGIN_POST_CONNECT_PLUGIN_RETURNED_NULL_36=The post-connect \
  plugin defined in configuration entry %s returned null when invoked for \
- connection %d from %s.  This is an illegal response, and the connection will \
+ connection %d from %s. This is an illegal response, and the connection will \
  be terminated
 ERR_PLUGIN_POST_DISCONNECT_PLUGIN_EXCEPTION_37=The post-disconnect \
  plugin defined in configuration entry %s threw an exception when it was \
- invoked for connection %d from %s:  %s
+ invoked for connection %d from %s: %s
 ERR_PLUGIN_POST_DISCONNECT_PLUGIN_RETURNED_NULL_38=The post-disconnect \
  plugin defined in configuration entry %s returned null when invoked for \
- connection %d from %s.  This is an illegal response
+ connection %d from %s. This is an illegal response
 ERR_PLUGIN_PRE_PARSE_PLUGIN_EXCEPTION_39=The pre-parse %s plugin \
  defined in configuration entry %s threw an exception when it was invoked for \
- connection %d operation %d:  %s.  Processing on this operation will be \
+ connection %d operation %d: %s. Processing on this operation will be \
  terminated
 ERR_PLUGIN_PRE_PARSE_PLUGIN_RETURNED_NULL_40=The pre-parse %s plugin \
  defined in configuration entry %s returned null when invoked for connection \
- %d operation %s.  This is an illegal response, and processing on this \
+ %d operation %s. This is an illegal response, and processing on this \
  operation will be terminated
 ERR_PLUGIN_PRE_OPERATION_PLUGIN_EXCEPTION_41=The pre-operation %s \
  plugin defined in configuration entry %s threw an exception when it was \
- invoked for connection %d operation %d:  %s.  Processing on this operation \
+ invoked for connection %d operation %d: %s. Processing on this operation \
  will be terminated
 ERR_PLUGIN_PRE_OPERATION_PLUGIN_RETURNED_NULL_42=The pre-operation %s \
  plugin defined in configuration entry %s returned null when invoked for \
- connection %d operation %d.  This is an illegal response, and processing on \
+ connection %d operation %d. This is an illegal response, and processing on \
  this operation will be terminated
 ERR_PLUGIN_POST_OPERATION_PLUGIN_EXCEPTION_43=The post-operation %s \
  plugin defined in configuration entry %s threw an exception when it was \
- invoked for connection %d operation %d:  %s.  Processing on this operation \
+ invoked for connection %d operation %d: %s. Processing on this operation \
  will be terminated
 ERR_PLUGIN_POST_OPERATION_PLUGIN_RETURNED_NULL_44=The post-operation \
  %s plugin defined in configuration entry %s returned null when invoked for \
- connection %d operation %d.  This is an illegal response, and processing on \
+ connection %d operation %d. This is an illegal response, and processing on \
  this operation will be terminated
 ERR_PLUGIN_POST_RESPONSE_PLUGIN_EXCEPTION_45=The post-response %s \
  plugin defined in configuration entry %s threw an exception when it was \
- invoked for connection %d operation %d:  %s.  Processing on this operation \
+ invoked for connection %d operation %d: %s. Processing on this operation \
  will be terminated
 ERR_PLUGIN_POST_RESPONSE_PLUGIN_RETURNED_NULL_46=The post-response %s \
  plugin defined in configuration entry %s returned null when invoked for \
- connection %d operation %d.  This is an illegal response, and processing on \
+ connection %d operation %d. This is an illegal response, and processing on \
  this operation will be terminated
 ERR_PLUGIN_SEARCH_ENTRY_PLUGIN_EXCEPTION_47=The search result entry \
  plugin defined in configuration entry %s threw an exception when it was \
- invoked for connection %d operation %d with entry %s:  %s.  Processing on \
+ invoked for connection %d operation %d with entry %s: %s. Processing on \
  this search operation will be terminated
 ERR_PLUGIN_SEARCH_ENTRY_PLUGIN_RETURNED_NULL_48=The search result \
  entry plugin defined in configuration entry %s returned null when invoked for \
- connection %d operation %d with entry %s.  This is an illegal response, and \
+ connection %d operation %d with entry %s. This is an illegal response, and \
  processing on this search operation will be terminated
 ERR_PLUGIN_SEARCH_REFERENCE_PLUGIN_EXCEPTION_49=The search result \
  reference plugin defined in configuration entry %s threw an exception when it \
- was invoked for connection %d operation %d with referral URL(s) %s:  %s. \
+ was invoked for connection %d operation %d with referral URL(s) %s: %s. \
  Processing on this search operation will be terminated
 ERR_PLUGIN_SEARCH_REFERENCE_PLUGIN_RETURNED_NULL_50=The search result \
  reference plugin defined in configuration entry %s returned null when invoked \
- for connection %d operation %d with referral URL(s) %s.  This is an illegal \
+ for connection %d operation %d with referral URL(s) %s. This is an illegal \
  response, and processing on this search operation will be terminated
 ERR_PLUGIN_LASTMOD_INVALID_PLUGIN_TYPE_51=An attempt was made to \
- register the LastMod plugin to be invoked as a %s plugin.  This plugin type \
+ register the LastMod plugin to be invoked as a %s plugin. This plugin type \
  is not allowed for this plugin
 INFO_PROFILEVIEWER_DESCRIPTION_FILENAMES_52=Path to a profile \
- data file.  This  argument can be provided more than once to analyze data \
+ data file. This argument can be provided more than once to analyze data \
  from multiple data files
 INFO_PROFILEVIEWER_DESCRIPTION_USE_GUI_53=Indicates whether to view the \
  profile information in GUI mode or to write the resulting data to standard \
  output
 INFO_PROFILEVIEWER_DESCRIPTION_USAGE_54=Displays this usage information
 ERR_PROFILEVIEWER_CANNOT_INITIALIZE_ARGS_55=An unexpected error \
- occurred while attempting to initialize the command-line arguments:  %s
+ occurred while attempting to initialize the command-line arguments: %s
 ERR_PROFILEVIEWER_ERROR_PARSING_ARGS_56=An error occurred while \
- parsing the command-line arguments:  %s
+ parsing the command-line arguments: %s
 ERR_PROFILEVIEWER_CANNOT_PROCESS_DATA_FILE_57=An error occurred while \
- trying to process the profile data in file %s:  %s
+ trying to process the profile data in file %s: %s
 ERR_PLUGIN_LDIF_IMPORT_PLUGIN_EXCEPTION_58=The LDIF import plugin \
  defined in configuration entry %s threw an exception when it was invoked on \
- entry %s:  %s
+ entry %s: %s
 ERR_PLUGIN_LDIF_IMPORT_PLUGIN_RETURNED_NULL_59=The LDIF import plugin \
  defined in configuration entry %s returned null when invoked on entry %s. \
  This is an illegal response
 ERR_PLUGIN_LDIF_EXPORT_PLUGIN_EXCEPTION_60=The LDIF export plugin \
  defined in configuration entry %s threw an exception when it was invoked on \
- entry %s:  %s
+ entry %s: %s
 ERR_PLUGIN_LDIF_EXPORT_PLUGIN_RETURNED_NULL_61=The LDIF export plugin \
  defined in configuration entry %s returned null when invoked on entry %s. \
  This is an illegal response
 ERR_PLUGIN_ENTRYUUID_INVALID_PLUGIN_TYPE_62=An attempt was made to \
- register the EntryUUID plugin to be invoked as a %s plugin.  This plugin type \
+ register the EntryUUID plugin to be invoked as a %s plugin. This plugin type \
  is not allowed for this plugin
 ERR_PLUGIN_INTERMEDIATE_RESPONSE_PLUGIN_EXCEPTION_63=The intermediate \
  response plugin defined in configuration entry %s threw an exception when it \
- was invoked for connection %d operation %d:  %s.  Processing on this \
+ was invoked for connection %d operation %d: %s. Processing on this \
  operation will be terminated
 ERR_PLUGIN_INTERMEDIATE_RESPONSE_PLUGIN_RETURNED_NULL_64=The \
  intermediate response plugin defined in configuration entry %s returned null \
- when invoked for connection %d operation %d.  This is an illegal response, \
+ when invoked for connection %d operation %d. This is an illegal response, \
  and processing on this operation will be terminated
 ERR_PLUGIN_PWPIMPORT_INVALID_PLUGIN_TYPE_65=An attempt was made to \
  register the password policy import plugin to be invoked as a %s plugin. \
  This plugin type is not allowed for this plugin
 ERR_PLUGIN_PWPIMPORT_ERROR_ENCODING_PASSWORD_66=An error occurred \
  while attempting to encode a password value stored in attribute %s of user \
- entry %s:  %s.  Password values for this user will not be encoded
+ entry %s: %s. Password values for this user will not be encoded
 ERR_PLUGIN_TYPE_NOT_SUPPORTED_67=The plugin defined in configuration \
  entry %s does not support the %s plugin type
 INFO_PROFILEVIEWER_TOOL_DESCRIPTION_68=This utility can be used to view \
@@ -216,30 +217,30 @@
  configured for use in the server
 WARN_PLUGIN_PWIMPORT_NO_SUCH_POLICY_73=Entry '%s' indicates that it \
  uses custom password policy '%s', but no such policy is defined in the \
- server.  Any passwords contained in the entry will be encoded using the \
+ server. Any passwords contained in the entry will be encoded using the \
  default storage schemes, but authentication as this user might not be possible
 WARN_PLUGIN_PWIMPORT_CANNOT_DECODE_POLICY_DN_74=An error occurred \
  while attempting to decode the value of the custom password policy attribute \
- in entry '%s':  %s.  Any passwords contained in the entry will be encoded \
+ in entry '%s': %s. Any passwords contained in the entry will be encoded \
  using the default storage schemes, but authentication as this user might not be \
  possible
 ERR_PLUGIN_SUBORDINATE_MODIFY_DN_PLUGIN_EXCEPTION_75=The subordinate \
  modify DN plugin defined in configuration entry %s threw an exception when it \
- was invoked for connection %d operation %d:  %s.  Processing on this \
+ was invoked for connection %d operation %d: %s. Processing on this \
  operation will be terminated
 ERR_PLUGIN_SUBORDINATE_MODIFY_DN_PLUGIN_RETURNED_NULL_76=The \
  subordinate modify DN plugin defined in configuration entry %s returned null \
- when invoked for connection %d operation %s.  This is an illegal response, \
+ when invoked for connection %d operation %s. This is an illegal response, \
  and processing on this operation will be terminated
 ERR_PLUGIN_UNIQUEATTR_INVALID_PLUGIN_TYPE_77=An attempt was made to \
- register the Unique Attribute plugin to be invoked as a %s plugin.  This \
+ register the Unique Attribute plugin to be invoked as a %s plugin. This \
  plugin type is not allowed for this plugin
 ERR_PLUGIN_REFERENT_INVALID_PLUGIN_TYPE_81=An attempt was made to \
- register the Referential Integrity plugin to be invoked as a %s plugin.  This \
+ register the Referential Integrity plugin to be invoked as a %s plugin. This \
  plugin type is not allowed for this plugin
 ERR_PLUGIN_REFERENT_CREATE_LOGFILE_82=An error occurred during \
  Referential Integity plugin initialization because log file creation \
- failed:  %s
+ failed: %s
 ERR_PLUGIN_REFERENT_CLOSE_LOGFILE_83=An error occurred closing the \
  Referential Integrity plugin update log file: %s
 ERR_PLUGIN_REFERENT_REPLACE_LOGFILE_84=An error occurred replacing the \
@@ -272,15 +273,15 @@
  1.3.6.1.4.1.1466.115.121.1.12 (for the distinguished name syntax) or \
  1.3.6.1.4.1.1466.115.121.1.34 (for the name and optional uid syntax)
 ERR_PLUGIN_7BIT_INVALID_PLUGIN_TYPE_96=The 7-bit clean plugin is \
- configured with invalid plugin type %s.  Only the ldifImport, \
+ configured with invalid plugin type %s. Only the ldifImport, \
  preOperationAdd, preOperationModify, and preOperationModifyDN plugin types \
  are allowed
 ERR_PLUGIN_7BIT_CANNOT_DECODE_DN_97=An error occurred while trying to \
- decode the DN of the target entry:  %s
+ decode the DN of the target entry: %s
 ERR_PLUGIN_7BIT_CANNOT_DECODE_ATTR_98=An error occurred while trying to \
- decode attribute %s in the target entry:  %s
+ decode attribute %s in the target entry: %s
 ERR_PLUGIN_7BIT_CANNOT_DECODE_NEW_RDN_99=An error occurred while trying \
- to decode the new RDN:  %s
+ to decode the new RDN: %s
 ERR_PLUGIN_7BIT_MODIFYDN_ATTR_NOT_CLEAN_102=The modify DN operation \
  would have resulted in a value for attribute %s that was not 7-bit clean
 ERR_PLUGIN_7BIT_IMPORT_ATTR_NOT_CLEAN_103=The entry included a value for \
@@ -290,12 +291,12 @@
  which is not available for use in the server
 ERR_PLUGIN_POST_SYNCHRONIZATION_PLUGIN_EXCEPTION_105=The \
  post-synchronization %s plugin defined in configuration entry %s threw an \
- exception when it was invoked for connection %d operation %d:  %s
+ exception when it was invoked for connection %d operation %d: %s
 ERR_PLUGIN_UNIQUEATTR_ATTR_NOT_UNIQUE_106=A unique attribute conflict \
- was detected for attribute %s:  value %s already exists in entry %s
+ was detected for attribute %s: value %s already exists in entry %s
 ERR_PLUGIN_UNIQUEATTR_SYNC_NOT_UNIQUE_107=A unique attribute conflict \
- was detected for attribute %s during synchronization (connID=%d, opID=%d):  \
- value %s in entry %s conflicts with an existing value in entry %s.  Manual \
+ was detected for attribute %s during synchronization (connID=%d, opID=%d): \
+ value %s in entry %s conflicts with an existing value in entry %s. Manual \
  interaction is required to eliminate the conflict
 ERR_PLUGIN_UNIQUEATTR_INTERNAL_ERROR_108=An internal error occurred \
  while attempting to determine whether the operation would have resulted in a \
@@ -313,10 +314,10 @@
  attribute %s but there is no equality index defined for this attribute \
  in backend %s
 ERR_PLUGIN_NETWORKGROUP_INVALID_PLUGIN_TYPE_112=An attempt was made to \
- register the NetworkGroup plugin to be invoked as a %s plugin.  This plugin \
+ register the NetworkGroup plugin to be invoked as a %s plugin. This plugin \
  type is not allowed for this plugin
 ERR_PLUGIN_CHANGE_NUMBER_INVALID_PLUGIN_TYPE_113=An attempt was made to \
- register the Change Number Control plugin to be invoked as a %s plugin.  This \
+ register the Change Number Control plugin to be invoked as a %s plugin. This \
  plugin type is not allowed for this plugin
 ERR_PLUGIN_CHANGE_NUMBER_INVALID_PLUGIN_TYPE_LIST_114=An attempt was \
  made to register the Change Number Control plugin with the following plugin \
@@ -324,11 +325,11 @@
  plugin types : %s
 ERR_PLUGIN_SUBORDINATE_DELETE_PLUGIN_EXCEPTION_115=The subordinate \
  delete plugin defined in configuration entry %s threw an exception when it \
- was invoked for connection %d operation %d:  %s.  Processing on this \
+ was invoked for connection %d operation %d: %s. Processing on this \
  operation will be terminated
 ERR_PLUGIN_SUBORDINATE_DELETE_PLUGIN_RETURNED_NULL_116=The \
  subordinate delete plugin defined in configuration entry %s returned null \
- when invoked for connection %d operation %s.  This is an illegal response, \
+ when invoked for connection %d operation %s. This is an illegal response, \
  and processing on this operation will be terminated
 ERR_PLUGIN_SAMBA_SYNC_INVALID_PLUGIN_TYPE_117=An attempt was made to \
  register the Samba password synchronization plugin to be invoked as a %s plugin. \
diff --git a/opendj3-server-dev/src/messages/messages/protocol.properties b/opendj3-server-dev/src/messages/messages/protocol.properties
index 1aeb9f3..c3399c7 100644
--- a/opendj3-server-dev/src/messages/messages/protocol.properties
+++ b/opendj3-server-dev/src/messages/messages/protocol.properties
@@ -86,124 +86,124 @@
  sequence as an LDAP message because the sequence was null
 ERR_LDAP_MESSAGE_DECODE_MESSAGE_ID_47=Cannot decode the provided ASN.1 \
  sequence as an LDAP message because the first element of the sequence could \
- not be decoded as an integer message ID:  %s
+ not be decoded as an integer message ID: %s
 ERR_LDAP_MESSAGE_DECODE_PROTOCOL_OP_48=Cannot decode the provided ASN.1 \
  sequence as an LDAP message because the second element of the sequence could \
- not be decoded as the protocol op:  %s
+ not be decoded as the protocol op: %s
 ERR_LDAP_MESSAGE_DECODE_CONTROLS_49=Cannot decode the provided ASN.1 \
  sequence as an LDAP message because the third element of the sequence could \
- not be decoded as the set of controls:  %s
+ not be decoded as the set of controls: %s
 ERR_LDAP_CONTROL_DECODE_SEQUENCE_51=Cannot decode the provided ASN.1 \
  element as an LDAP control because the element could not be decoded as a \
- sequence:  %s
+ sequence: %s
 ERR_LDAP_CONTROL_DECODE_OID_53=Cannot decode the provided ASN.1 element \
- as an LDAP control because the OID could not be decoded as a string:  %s
+ as an LDAP control because the OID could not be decoded as a string: %s
 ERR_LDAP_CONTROL_DECODE_CRITICALITY_54=Cannot decode the provided ASN.1 \
  element as an LDAP control because the criticality could not be decoded as \
- Boolean value:  %s
+ Boolean value: %s
 ERR_LDAP_CONTROL_DECODE_VALUE_55=Cannot decode the provided ASN.1 \
  element as an LDAP control because the value could not be decoded as an octet \
- string:  %s
+ string: %s
 ERR_LDAP_CONTROL_DECODE_CONTROLS_SEQUENCE_58=Cannot decode the provided \
  ASN.1 element as a set of LDAP controls because the element could not be \
- decoded as a sequence:  %s
+ decoded as a sequence: %s
 ERR_LDAP_ABANDON_REQUEST_DECODE_ID_59=Cannot decode the provided ASN.1 \
  element as an LDAP abandon request protocol op because a problem occurred \
- while trying to obtain the message ID of the operation to abandon:  %s
+ while trying to obtain the message ID of the operation to abandon: %s
 ERR_LDAP_RESULT_DECODE_SEQUENCE_60=Cannot decode the provided ASN.1 \
  element as an LDAP result protocol op because a problem occurred while trying \
- to parse the result sequence:  %s
+ to parse the result sequence: %s
 ERR_LDAP_RESULT_DECODE_RESULT_CODE_62=Cannot decode the provided ASN.1 \
  element as an LDAP result protocol op because the first element in the result \
- sequence could not be decoded as an integer result code:  %s
+ sequence could not be decoded as an integer result code: %s
 ERR_LDAP_RESULT_DECODE_MATCHED_DN_63=Cannot decode the provided ASN.1 \
  element as an LDAP result protocol op because the second element in the \
- result sequence could not be decoded as the matched DN:  %s
+ result sequence could not be decoded as the matched DN: %s
 ERR_LDAP_RESULT_DECODE_ERROR_MESSAGE_64=Cannot decode the provided ASN.1 \
  element as an LDAP result protocol op because the third element in the result \
- sequence could not be decoded as the error message:  %s
+ sequence could not be decoded as the error message: %s
 ERR_LDAP_RESULT_DECODE_REFERRALS_65=Cannot decode the provided ASN.1 \
  element as an LDAP result protocol op because the fourth element in the \
- result sequence could not be decoded as a set of referral URLs:  %s
+ result sequence could not be decoded as a set of referral URLs: %s
 ERR_LDAP_BIND_RESULT_DECODE_SERVER_SASL_CREDENTIALS_67=Cannot decode the \
  provided ASN.1 element as an LDAP bind response protocol op because the final \
  element in the result sequence could not be decoded as the server SASL \
- credentials:  %s
+ credentials: %s
 ERR_LDAP_EXTENDED_RESULT_DECODE_OID_71=Cannot decode the provided ASN.1 \
  element as an LDAP bind response protocol op because the response OID could \
- not be decoded:  %s
+ not be decoded: %s
 ERR_LDAP_EXTENDED_RESULT_DECODE_VALUE_72=Cannot decode the provided \
  ASN.1 element as an LDAP bind response protocol op because the response value \
- could not be decoded:  %s
+ could not be decoded: %s
 ERR_LDAP_UNBIND_DECODE_74=Cannot decode the provided ASN.1 element as an \
- LDAP unbind request protocol op:  %s
+ LDAP unbind request protocol op: %s
 ERR_LDAP_BIND_REQUEST_DECODE_SEQUENCE_75=Cannot decode the provided \
  ASN.1 element as an LDAP bind request protocol op because the element could \
- not be decoded as a sequence:  %s
+ not be decoded as a sequence: %s
 ERR_LDAP_BIND_REQUEST_DECODE_VERSION_77=Cannot decode the provided ASN.1 \
  element as an LDAP bind request protocol op because the protocol version \
- could not be decoded as an integer:  %s
+ could not be decoded as an integer: %s
 ERR_LDAP_BIND_REQUEST_DECODE_DN_78=Cannot decode the provided ASN.1 \
  element as an LDAP bind request protocol op because the bind DN could not be \
- properly decoded:  %s
+ properly decoded: %s
 ERR_LDAP_BIND_REQUEST_DECODE_PASSWORD_79=Cannot decode the provided \
  ASN.1 element as an LDAP bind request protocol op because the password to use \
- for simple authentication could not be decoded:  %s
+ for simple authentication could not be decoded: %s
 ERR_LDAP_BIND_REQUEST_DECODE_SASL_INFO_80=Cannot decode the provided \
  ASN.1 element as an LDAP bind request protocol op because the SASL \
- authentication information could not be decoded:  %s
+ authentication information could not be decoded: %s
 ERR_LDAP_BIND_REQUEST_DECODE_INVALID_CRED_TYPE_81=Cannot decode the \
  provided ASN.1 element as an LDAP bind request protocol op because the \
  authentication info element had an invalid BER type (expected 80 or A3, got \
  %x)
 ERR_LDAP_BIND_REQUEST_DECODE_CREDENTIALS_82=Cannot decode the provided \
  ASN.1 element as an LDAP bind request protocol op because an unexpected error \
- occurred while trying to decode the authentication info element:  %s
+ occurred while trying to decode the authentication info element: %s
 ERR_LDAP_COMPARE_REQUEST_DECODE_SEQUENCE_83=Cannot decode the provided \
  ASN.1 element as an LDAP compare request protocol op because the element \
- could not be decoded as a sequence:  %s
+ could not be decoded as a sequence: %s
 ERR_LDAP_COMPARE_REQUEST_DECODE_DN_85=Cannot decode the provided ASN.1 \
  element as an LDAP compare request protocol op because the target DN could \
- not be properly decoded:  %s
+ not be properly decoded: %s
 ERR_LDAP_COMPARE_REQUEST_DECODE_AVA_86=Cannot decode the provided ASN.1 \
  element as an LDAP compare request protocol op because the attribute value \
- assertion could not be decoded as a sequence:  %s
+ assertion could not be decoded as a sequence: %s
 ERR_LDAP_COMPARE_REQUEST_DECODE_TYPE_88=Cannot decode the provided ASN.1 \
  element as an LDAP compare request protocol op because the attribute type \
- could not be properly decoded:  %s
+ could not be properly decoded: %s
 ERR_LDAP_COMPARE_REQUEST_DECODE_VALUE_89=Cannot decode the provided \
  ASN.1 element as an LDAP compare request protocol op because the assertion \
- value could not be properly decoded:  %s
+ value could not be properly decoded: %s
 ERR_LDAP_DELETE_REQUEST_DECODE_DN_90=Cannot decode the provided ASN.1 \
  element as an LDAP delete request protocol op because the target DN could not \
- be properly decoded:  %s
+ be properly decoded: %s
 ERR_LDAP_EXTENDED_REQUEST_DECODE_SEQUENCE_91=Cannot decode the provided \
  ASN.1 element as an LDAP extended request protocol op because the element \
- could not be decoded as a sequence:  %s
+ could not be decoded as a sequence: %s
 ERR_LDAP_EXTENDED_REQUEST_DECODE_OID_93=Cannot decode the provided ASN.1 \
  element as an LDAP extended request protocol op because the OID could not be \
- properly decoded:  %s
+ properly decoded: %s
 ERR_LDAP_EXTENDED_REQUEST_DECODE_VALUE_94=Cannot decode the provided \
  ASN.1 element as an LDAP extended request protocol op because the value could \
- not be properly decoded:  %s
+ not be properly decoded: %s
 ERR_LDAP_MODIFY_DN_REQUEST_DECODE_SEQUENCE_95=Cannot decode the provided \
  ASN.1 element as an LDAP modify DN request protocol op because the element \
- could not be decoded as a sequence:  %s
+ could not be decoded as a sequence: %s
 ERR_LDAP_MODIFY_DN_REQUEST_DECODE_DN_97=Cannot decode the provided ASN.1 \
  element as an LDAP modify DN request protocol op because the entry DN could \
- not be properly decoded:  %s
+ not be properly decoded: %s
 ERR_LDAP_MODIFY_DN_REQUEST_DECODE_NEW_RDN_98=Cannot decode the provided \
  ASN.1 element as an LDAP modify DN request protocol op because the new RDN \
- could not be properly decoded:  %s
+ could not be properly decoded: %s
 ERR_LDAP_MODIFY_DN_REQUEST_DECODE_DELETE_OLD_RDN_99=Cannot decode the \
  provided ASN.1 element as an LDAP modify DN request protocol op because the \
- deleteOldRDN flag could not be properly decoded:  %s
+ deleteOldRDN flag could not be properly decoded: %s
 ERR_LDAP_MODIFY_DN_REQUEST_DECODE_NEW_SUPERIOR_100=Cannot decode the \
  provided ASN.1 element as an LDAP modify DN request protocol op because the \
- new superior DN could not be properly decoded:  %s
+ new superior DN could not be properly decoded: %s
 ERR_LDAP_ATTRIBUTE_DECODE_SEQUENCE_101=Cannot decode the provided ASN.1 \
  element as an LDAP attribute because the element could not be decoded as a \
- sequence:  %s
+ sequence: %s
 ERR_LDAP_ATTRIBUTE_DECODE_TYPE_103=Cannot decode the provided ASN.1 \
  element as an LDAP attribute because the attribute type could not be decoded: \
  %s
@@ -212,83 +212,83 @@
  %s
 ERR_LDAP_ADD_REQUEST_DECODE_SEQUENCE_105=Cannot decode the provided \
  ASN.1 element as an LDAP add request protocol op because the element could \
- not be decoded as a sequence:  %s
+ not be decoded as a sequence: %s
 ERR_LDAP_ADD_REQUEST_DECODE_DN_107=Cannot decode the provided ASN.1 \
  element as an LDAP add request protocol op because the entry DN could not be \
- decoded:  %s
+ decoded: %s
 ERR_LDAP_ADD_REQUEST_DECODE_ATTRS_108=Cannot decode the provided ASN.1 \
  element as an LDAP add request protocol op because the set of attributes \
- could not be decoded:  %s
+ could not be decoded: %s
 ERR_LDAP_MODIFICATION_DECODE_SEQUENCE_109=Cannot decode the provided \
  ASN.1 element as an LDAP modification because the element could not be \
- decoded as a sequence:  %s
+ decoded as a sequence: %s
 ERR_LDAP_MODIFICATION_DECODE_INVALID_MOD_TYPE_111=Cannot decode the \
  provided ASN.1 element as an LDAP modification because it contained an \
  invalid modification type (%d)
 ERR_LDAP_MODIFICATION_DECODE_MOD_TYPE_112=Cannot decode the provided \
  ASN.1 element as an LDAP modification because the modification type could not \
- be decoded:  %s
+ be decoded: %s
 ERR_LDAP_MODIFICATION_DECODE_ATTR_113=Cannot decode the provided ASN.1 \
  element as an LDAP modification because the attribute could not be decoded: \
  %s
 ERR_LDAP_MODIFY_REQUEST_DECODE_SEQUENCE_114=Cannot decode the provided \
  ASN.1 element as an LDAP modify request protocol op because the element could \
- not be decoded as a sequence:  %s
+ not be decoded as a sequence: %s
 ERR_LDAP_MODIFY_REQUEST_DECODE_DN_116=Cannot decode the provided ASN.1 \
  element as an LDAP modify request protocol op because the entry DN could not \
- be decoded:  %s
+ be decoded: %s
 ERR_LDAP_MODIFY_REQUEST_DECODE_MODS_117=Cannot decode the provided ASN.1 \
  element as an LDAP modify request protocol op because the set of \
- modifications could not be decoded:  %s
+ modifications could not be decoded: %s
 ERR_LDAP_SEARCH_ENTRY_DECODE_SEQUENCE_118=Cannot decode the provided \
  ASN.1 element as an LDAP search result entry protocol op because the element \
- could not be decoded as a sequence:  %s
+ could not be decoded as a sequence: %s
 ERR_LDAP_SEARCH_ENTRY_DECODE_DN_120=Cannot decode the provided ASN.1 \
  element as an LDAP search result entry protocol op because the entry DN could \
- not be decoded:  %s
+ not be decoded: %s
 ERR_LDAP_SEARCH_ENTRY_DECODE_ATTRS_121=Cannot decode the provided ASN.1 \
  element as an LDAP search result entry protocol op because the set of \
- attributes could not be decoded:  %s
+ attributes could not be decoded: %s
 ERR_LDAP_SEARCH_REFERENCE_DECODE_SEQUENCE_122=Cannot decode the provided \
  ASN.1 element as an LDAP search result reference protocol op because the \
- element could not be decoded as a sequence:  %s
+ element could not be decoded as a sequence: %s
 ERR_LDAP_SEARCH_REFERENCE_DECODE_URLS_123=Cannot decode the provided \
  ASN.1 element as an LDAP search result reference protocol op because a \
  problem occurred while trying to decode the sequence elements as referral \
- URLs:  %s
+ URLs: %s
 ERR_LDAP_SEARCH_REQUEST_DECODE_SEQUENCE_124=Cannot decode the provided \
  ASN.1 element as an LDAP search request protocol op because the element could \
- not be decoded as a sequence:  %s
+ not be decoded as a sequence: %s
 ERR_LDAP_SEARCH_REQUEST_DECODE_BASE_126=Cannot decode the provided ASN.1 \
  element as an LDAP search request protocol op because the base DN could not \
- be decoded:  %s
+ be decoded: %s
 ERR_LDAP_SEARCH_REQUEST_DECODE_INVALID_SCOPE_127=Cannot decode the \
  provided ASN.1 element as an LDAP search request protocol op because the \
  provided scope value (%d) is invalid
 ERR_LDAP_SEARCH_REQUEST_DECODE_SCOPE_128=Cannot decode the provided \
  ASN.1 element as an LDAP search request protocol op because the scope could \
- not be decoded:  %s
+ not be decoded: %s
 ERR_LDAP_SEARCH_REQUEST_DECODE_INVALID_DEREF_129=Cannot decode the \
  provided ASN.1 element as an LDAP search request protocol op because the \
  provided alias dereferencing policy value (%d) is invalid
 ERR_LDAP_SEARCH_REQUEST_DECODE_DEREF_130=Cannot decode the provided \
  ASN.1 element as an LDAP search request protocol op because the alias \
- dereferencing policy could not be decoded:  %s
+ dereferencing policy could not be decoded: %s
 ERR_LDAP_SEARCH_REQUEST_DECODE_SIZE_LIMIT_131=Cannot decode the provided \
  ASN.1 element as an LDAP search request protocol op because the size limit \
- could not be decoded:  %s
+ could not be decoded: %s
 ERR_LDAP_SEARCH_REQUEST_DECODE_TIME_LIMIT_132=Cannot decode the provided \
  ASN.1 element as an LDAP search request protocol op because the time limit \
- could not be decoded:  %s
+ could not be decoded: %s
 ERR_LDAP_SEARCH_REQUEST_DECODE_TYPES_ONLY_133=Cannot decode the provided \
  ASN.1 element as an LDAP search request protocol op because the typesOnly \
- flag could not be decoded:  %s
+ flag could not be decoded: %s
 ERR_LDAP_SEARCH_REQUEST_DECODE_FILTER_134=Cannot decode the provided \
  ASN.1 element as an LDAP search request protocol op because the filter could \
- not be decoded:  %s
+ not be decoded: %s
 ERR_LDAP_SEARCH_REQUEST_DECODE_ATTRIBUTES_135=Cannot decode the provided \
  ASN.1 element as an LDAP search request protocol op because the requested \
- attribute set could not be decoded:  %s
+ attribute set could not be decoded: %s
 ERR_LDAP_PROTOCOL_OP_DECODE_NULL_136=Cannot decode the provided ASN.1 \
  element as an LDAP protocol op because the element was null
 ERR_LDAP_PROTOCOL_OP_DECODE_INVALID_TYPE_137=Cannot decode the provided \
@@ -301,70 +301,70 @@
  (%x) for a search filter
 ERR_LDAP_FILTER_DECODE_COMPOUND_COMPONENTS_141=Cannot decode the \
  provided ASN.1 element as an LDAP search filter because an unexpected error \
- occurred while trying to decode one of the compound filter components:  %s
+ occurred while trying to decode one of the compound filter components: %s
 ERR_LDAP_FILTER_DECODE_NOT_COMPONENT_143=Cannot decode the provided \
  ASN.1 element as an LDAP search filter because the NOT component element \
- could not be decoded as an LDAP filter:  %s
+ could not be decoded as an LDAP filter: %s
 ERR_LDAP_FILTER_DECODE_TV_SEQUENCE_144=Cannot decode the provided ASN.1 \
  element as an LDAP search filter because the element could not be decoded as \
- a type-and-value sequence:  %s
+ a type-and-value sequence: %s
 ERR_LDAP_FILTER_DECODE_TV_TYPE_146=Cannot decode the provided ASN.1 \
  element as an LDAP search filter because the attribute type could not be \
- decoded from the type-and-value sequence:  %s
+ decoded from the type-and-value sequence: %s
 ERR_LDAP_FILTER_DECODE_TV_VALUE_147=Cannot decode the provided ASN.1 \
  element as an LDAP search filter because the assertion value could not be \
- decoded from the type-and-value sequence:  %s
+ decoded from the type-and-value sequence: %s
 ERR_LDAP_FILTER_DECODE_SUBSTRING_SEQUENCE_148=Cannot decode the provided \
  ASN.1 element as an LDAP search filter because the element could not be \
- decoded as a substring sequence:  %s
+ decoded as a substring sequence: %s
 ERR_LDAP_FILTER_DECODE_SUBSTRING_TYPE_150=Cannot decode the provided \
  ASN.1 element as an LDAP search filter because the attribute type could not \
- be decoded from the substring sequence:  %s
+ be decoded from the substring sequence: %s
 ERR_LDAP_FILTER_DECODE_SUBSTRING_ELEMENTS_151=Cannot decode the provided \
  ASN.1 element as an LDAP search filter because the substring value sequence \
- could not be decoded:  %s
+ could not be decoded: %s
 ERR_LDAP_FILTER_DECODE_SUBSTRING_NO_SUBELEMENTS_152=Cannot decode the \
  provided ASN.1 element as an LDAP search filter because the substring value \
  sequence did not contain any elements
 ERR_LDAP_FILTER_DECODE_SUBSTRING_VALUES_154=Cannot decode the provided \
  ASN.1 element as an LDAP search filter because a problem occurred while \
- trying to parse the substring value elements:  %s
+ trying to parse the substring value elements: %s
 ERR_LDAP_FILTER_DECODE_PRESENCE_TYPE_155=Cannot decode the provided \
  ASN.1 element as an LDAP search filter because the element could not be \
- decoded as the presence attribute type:  %s
+ decoded as the presence attribute type: %s
 ERR_LDAP_FILTER_DECODE_EXTENSIBLE_SEQUENCE_156=Cannot decode the \
  provided ASN.1 element as an LDAP search filter because the element could not \
- be decoded as an extensible matching sequence:  %s
+ be decoded as an extensible matching sequence: %s
 ERR_LDAP_FILTER_DECODE_EXTENSIBLE_ELEMENTS_158=Cannot decode the \
  provided ASN.1 element as an LDAP search filter because a problem occurred \
- while trying to parse the extensible match sequence elements:  %s
+ while trying to parse the extensible match sequence elements: %s
 ERR_LDAP_CLIENT_SEND_RESPONSE_NO_RESULT_CODE_159=The server attempted to \
  send a response to the %s operation (conn=%d, op=%d), but the operation did \
- not have a result code.  This could indicate that the operation did not \
+ not have a result code. This could indicate that the operation did not \
  complete properly or that it is one that is not allowed to have a response. \
  Using a generic 'Operations Error' response
 ERR_LDAP_CLIENT_SEND_RESPONSE_INVALID_OP_160=The server attempted to \
  send a response to the %s operation (conn=%d, op=%d), but this type of \
- operation is not allowed to have responses.  Backtrace:  %s
+ operation is not allowed to have responses. Backtrace: %s
 INFO_LDAP_CLIENT_GENERIC_NOTICE_OF_DISCONNECTION_165=The Directory Server is \
  closing the connection to this client
 WARN_CLIENT_DISCONNECT_IN_PROGRESS_166=The Directory Server is \
  currently in the process of closing this client connection
 ERR_LDAP_CLIENT_DECODE_MAX_REQUEST_SIZE_EXCEEDED_168=The client sent a \
  request to the Directory Server with an ASN.1 element value length of %d \
- bytes.  This exceeds the maximum allowed request size of %d bytes, so \
+ bytes. This exceeds the maximum allowed request size of %d bytes, so \
  processing cannot continue on this connection
 ERR_LDAP_CONNHANDLER_OPEN_SELECTOR_FAILED_177=The LDAP connection \
  handler defined in configuration entry %s was unable to open a selector to \
- allow it to multiplex the associated accept sockets:  %s.  This connection \
+ allow it to multiplex the associated accept sockets: %s. This connection \
  handler will be disabled
 ERR_LDAP_CONNHANDLER_CREATE_CHANNEL_FAILED_178=The LDAP connection \
  handler defined in configuration entry %s was unable to create a server \
- socket channel to accept connections on %s:%d:  %s.  The Directory Server \
+ socket channel to accept connections on %s:%d: %s. The Directory Server \
  will not listen for new connections on that address
 ERR_LDAP_CONNHANDLER_NO_ACCEPTORS_179=The LDAP connection handler \
  defined in configuration entry %s was unable to create any of the socket \
- channels on any of the configured addresses.  This connection handler will be \
+ channels on any of the configured addresses. This connection handler will be \
  disabled
 ERR_CONNHANDLER_DENIED_CLIENT_180=The connection attempt from \
  client %s to %s has been rejected because the client was included in one of \
@@ -374,20 +374,20 @@
  of the allowed address ranges
 INFO_CONNHANDLER_UNABLE_TO_REGISTER_CLIENT_182=An internal error \
  prevented the Directory Server from properly registering the client \
- connection from %s to %s with an appropriate request handler:  %s
+ connection from %s to %s with an appropriate request handler: %s
 ERR_CONNHANDLER_CANNOT_ACCEPT_CONNECTION_183=The %s defined in \
- configuration entry %s was unable to accept a new client connection:  %s
+ configuration entry %s was unable to accept a new client connection: %s
 ERR_CONNHANDLER_CONSECUTIVE_ACCEPT_FAILURES_184=The %s defined in \
  configuration entry %s has experienced consecutive failures while trying to \
- accept client connections:  %s.  This connection handler will be disabled
+ accept client connections: %s. This connection handler will be disabled
 ERR_LDAP_CONNHANDLER_UNCAUGHT_ERROR_185=The LDAP connection handler \
  defined in configuration entry %s caught an unexpected error while trying to \
- listen for new connections:  %s.  This connection handler will be disabled
+ listen for new connections: %s. This connection handler will be disabled
 ERR_LDAP_REQHANDLER_OPEN_SELECTOR_FAILED_186=%s was unable to open a \
- selector to multiplex reads from clients:  %s.  This request handler cannot \
+ selector to multiplex reads from clients: %s. This request handler cannot \
  continue processing
 ERR_LDAP_REQHANDLER_CANNOT_REGISTER_187=%s was unable to register this \
- client connection with the selector:  %s
+ client connection with the selector: %s
 ERR_LDAP_REQHANDLER_REJECT_DUE_TO_SHUTDOWN_188=This connection could \
  not be registered with a request handler because the Directory Server is \
  shutting down
@@ -398,7 +398,7 @@
  LDAP search filter because the string was null
 ERR_LDAP_FILTER_UNCAUGHT_EXCEPTION_193=Cannot decode the provided string \
  %s as an LDAP search filter because an unexpected exception was thrown during \
- processing:  %s
+ processing: %s
 ERR_LDAP_FILTER_MISMATCHED_PARENTHESES_194=The provided search filter \
  "%s" had mismatched parentheses around the portion between positions %d and \
  %d
@@ -406,7 +406,7 @@
  missing an equal sign in the suspected simple filter component between \
  positions %d and %d
 ERR_LDAP_FILTER_INVALID_ESCAPED_BYTE_196=The provided search filter "%s" \
- had an invalid escaped byte value at position %d.  A backslash in a value \
+ had an invalid escaped byte value at position %d. A backslash in a value \
  must be followed by two hexadecimal characters that define the byte that has \
  been encoded
 ERR_LDAP_FILTER_COMPOUND_MISSING_PARENTHESES_197=The provided search \
@@ -430,73 +430,73 @@
  message ID %d) that is not allowed for request messages
 ERR_LDAP_DISCONNECT_DUE_TO_PROCESSING_FAILURE_203=An unexpected \
  failure occurred while trying to process a request of type %s (LDAP message \
- ID %d):  %s.  The client connection will be terminated
+ ID %d): %s. The client connection will be terminated
 ERR_LDAP_INVALID_BIND_AUTH_TYPE_204=The bind request message (LDAP \
- message ID %d) included an invalid authentication type of %s.  This is a \
+ message ID %d) included an invalid authentication type of %s. This is a \
  protocol error, and this connection will be terminated as per RFC 2251 \
  section 4.2.3
 ERR_LDAP_DISCONNECT_DUE_TO_BIND_PROTOCOL_ERROR_205=This client \
  connection is being terminated because a protocol error occurred while trying \
- to process a bind request.  The LDAP message ID was %d and the error message \
+ to process a bind request. The LDAP message ID was %d and the error message \
  for the bind response was %s
 ERR_LDAPV2_SKIPPING_EXTENDED_RESPONSE_206=An extended response message \
  would have been sent to an LDAPv2 client (connection ID=%d, operation ID=%d): \
- %s.  LDAPv2 does not allow extended operations, so this response will not be \
+ %s. LDAPv2 does not allow extended operations, so this response will not be \
  sent
 ERR_LDAPV2_SKIPPING_SEARCH_REFERENCE_207=A search performed by an LDAPv2 \
  client (connection ID=%d, operation ID=%d) would have included a search \
- result reference %s.  Referrals are not allowed for LDAPv2 clients, so this \
+ result reference %s. Referrals are not allowed for LDAPv2 clients, so this \
  search reference will not be sent
 ERR_LDAPV2_REFERRAL_RESULT_CHANGED_208=The original result code for this \
  message was 10 but this result is not allowed for LDAPv2 clients
 ERR_LDAPV2_REFERRALS_OMITTED_209=The response included one or more \
- referrals, which are not allowed for LDAPv2 clients.  The referrals included \
- were:  %s
+ referrals, which are not allowed for LDAPv2 clients. The referrals included \
+ were: %s
 ERR_LDAPV2_CLIENTS_NOT_ALLOWED_210=The Directory Server has been \
- configured to deny access to LDAPv2 clients.  This connection will be closed
+ configured to deny access to LDAPv2 clients. This connection will be closed
 ERR_LDAPV2_EXTENDED_REQUEST_NOT_ALLOWED_211=The client with connection \
  ID %d authenticated to the Directory Server using LDAPv2, but attempted to \
  send an extended operation request (LDAP message ID %d), which is not allowed \
- for LDAPv2 clients.  The connection will be terminated
+ for LDAPv2 clients. The connection will be terminated
 ERR_LDAP_STATS_INVALID_MONITOR_INITIALIZATION_212=An attempt was made to \
  initialize the LDAP statistics monitor provider as defined in configuration \
- entry %s.  This monitor provider should only be dynamically created within \
+ entry %s. This monitor provider should only be dynamically created within \
  the Directory Server itself and not from within the configuration
 ERR_LDAP_REQHANDLER_UNEXPECTED_SELECT_EXCEPTION_213=The LDAP request \
  handler thread "%s" encountered an unexpected error that would have caused \
- the thread to die:  %s.  The error has been caught and the request handler \
+ the thread to die: %s. The error has been caught and the request handler \
  should continue operating as normal
 ERR_CONNHANDLER_REJECTED_BY_SERVER_214=The attempt to register this \
- connection with the Directory Server was rejected.  This might indicate that \
+ connection with the Directory Server was rejected. This might indicate that \
  the server already has the maximum allowed number of concurrent connections \
  established, or that it is in a restricted access mode
 INFO_LDAP_CONNHANDLER_DESCRIPTION_LISTEN_PORT_216=TCP port on \
- which this connection handler can accept client connections.  Changes to this \
+ which this connection handler can accept client connections. Changes to this \
  configuration attribute will not take effect until the connection handler is \
  disabled and re-enabled, or until the Directory Server is restarted
 INFO_LDAP_CONNHANDLER_DESCRIPTION_ALLOW_STARTTLS_227=Indicates whether this \
  connection handler should allow clients to use the StartTLS extended \
  operation to initiate secure communication over a non-SSL LDAP connection. \
- This can not be used if SSL is enabled for the connection handler.  Changes \
+ This can not be used if SSL is enabled for the connection handler. Changes \
  to this configuration attribute will take effect immediately for LDAP clients
 INFO_LDAP_CONNHANDLER_DESCRIPTION_SSL_CERT_NICKNAME_229=Nickname of the \
  certificate that the connection handler should use when \
- accepting SSL-based connections or performing StartTLS negotiation.  Changes \
+ accepting SSL-based connections or performing StartTLS negotiation. Changes \
  to this configuration attribute will not take effect until the connection \
  handler is disabled and re-enabled, or until the Directory Server is \
  restarted
 ERR_INTERNAL_CANNOT_DECODE_DN_264=An unexpected error occurred while \
- trying to decode the DN %s used for internal operations as a root user:  %s
+ trying to decode the DN %s used for internal operations as a root user: %s
 ERR_LDAP_TLS_EXISTING_SECURITY_PROVIDER_271=The TLS connection security \
  provider cannot be enabled on this client connection because it is already \
- using the %s provider.  StartTLS can only be used on clear-text connections
+ using the %s provider. StartTLS can only be used on clear-text connections
 ERR_LDAP_TLS_STARTTLS_NOT_ALLOWED_272=StartTLS cannot be enabled on this \
  LDAP client connection because the corresponding LDAP connection handler is \
- configured to reject StartTLS requests.  The use of StartTLS can be enabled \
+ configured to reject StartTLS requests. The use of StartTLS can be enabled \
  using the ds-cfg-allow-start-tls configuration attribute
 ERR_LDAP_TLS_CANNOT_CREATE_TLS_PROVIDER_273=An error occurred while \
  attempting to create a TLS connection security provider for this client \
- connection for use with StartTLS:  %s
+ connection for use with StartTLS: %s
 NOTE_CONNHANDLER_STARTED_LISTENING_276=Started listening for new \
  connections on %s
 NOTE_CONNHANDLER_STOPPED_LISTENING_277=Stopped listening for new \
@@ -505,40 +505,40 @@
  element as an LDAP paged results control value because the element is null
 ERR_LDAP_PAGED_RESULTS_DECODE_SEQUENCE_279=Cannot decode the provided \
  ASN.1 element as an LDAP paged results control value because the element \
- could not be decoded as a sequence:  %s
+ could not be decoded as a sequence: %s
 ERR_LDAP_PAGED_RESULTS_DECODE_SIZE_281=Cannot decode the provided ASN.1 \
  element as an LDAP paged results control value because the size element could \
- not be properly decoded:  %s
+ not be properly decoded: %s
 ERR_LDAP_PAGED_RESULTS_DECODE_COOKIE_282=Cannot decode the provided \
  ASN.1 element as an LDAP paged results control value because the cookie could \
- not be properly decoded:  %s
+ not be properly decoded: %s
 ERR_LDAPASSERT_NO_CONTROL_VALUE_283=Cannot decode the provided LDAP \
  assertion control because the control does not have a value
 ERR_PREREADREQ_NO_CONTROL_VALUE_285=Cannot decode the provided LDAP \
  pre-read request control because the control does not have a value
 ERR_PREREADREQ_CANNOT_DECODE_VALUE_286=Cannot decode the provided LDAP \
  pre-read request control because an error occurred while trying to decode the \
- control value:  %s
+ control value: %s
 ERR_POSTREADREQ_NO_CONTROL_VALUE_287=Cannot decode the provided LDAP \
  post-read request control because the control does not have a value
 ERR_POSTREADREQ_CANNOT_DECODE_VALUE_288=Cannot decode the provided LDAP \
  post-read request control because an error occurred while trying to decode \
- the control value:  %s
+ the control value: %s
 ERR_PREREADRESP_NO_CONTROL_VALUE_289=Cannot decode the provided LDAP \
  pre-read response control because the control does not have a value
 ERR_PREREADRESP_CANNOT_DECODE_VALUE_290=Cannot decode the provided LDAP \
  pre-read response control because an error occurred while trying to decode \
- the control value:  %s
+ the control value: %s
 ERR_POSTREADRESP_NO_CONTROL_VALUE_291=Cannot decode the provided LDAP \
  post-read response control because the control does not have a value
 ERR_POSTREADRESP_CANNOT_DECODE_VALUE_292=Cannot decode the provided LDAP \
  post-read response control because an error occurred while trying to decode \
- the control value:  %s
+ the control value: %s
 ERR_PROXYAUTH1_NO_CONTROL_VALUE_293=Cannot decode the provided proxied \
  authorization V1 control because it does not have a value
 ERR_PROXYAUTH1_CANNOT_DECODE_VALUE_295=Cannot decode the provided \
  proxied authorization V1 control because an error occurred while attempting \
- to decode the control value:  %s
+ to decode the control value: %s
 ERR_PROXYAUTH1_NO_SUCH_USER_296=User %s specified in the proxied \
  authorization V1 control does not exist in the Directory Server
 ERR_PROXYAUTH2_NO_CONTROL_VALUE_297=Cannot decode the provided proxied \
@@ -563,12 +563,12 @@
  search control because it does not have a value
 ERR_PSEARCH_CANNOT_DECODE_VALUE_307=Cannot decode the provided \
  persistent search control because an error occurred while attempting to \
- decode the control value:  %s
+ decode the control value: %s
 ERR_ECN_NO_CONTROL_VALUE_308=Cannot decode the provided entry change \
  notification control because it does not have a value
 ERR_ECN_ILLEGAL_PREVIOUS_DN_310=Cannot decode the provided entry change \
  notification control because it contains a previous DN element but had a \
- change type of %s.  The previous DN element can only be provided with the \
+ change type of %s. The previous DN element can only be provided with the \
  modify DN change type
 ERR_ECN_INVALID_ELEMENT_TYPE_311=Cannot decode the provided entry change \
  notification control because the second element in the value sequence has an \
@@ -576,16 +576,16 @@
  change number
 ERR_ECN_CANNOT_DECODE_VALUE_312=Cannot decode the provided entry change \
  notification control because an error occurred while attempting to decode the \
- control value:  %s
+ control value: %s
 ERR_AUTHZIDRESP_NO_CONTROL_VALUE_313=Cannot decode the provided \
  authorization identity response control because it does not have a value
 ERR_LDAP_INTERMEDIATE_RESPONSE_DECODE_SEQUENCE_314=Cannot decode the \
  provided ASN.1 element as an LDAP intermediate response protocol op because \
- the element could not be decoded as a sequence:  %s
+ the element could not be decoded as a sequence: %s
 ERR_LDAP_INTERMEDIATE_RESPONSE_CANNOT_DECODE_OID_316=An error occurred \
- while attempting to decode the intermediate response OID:  %s
+ while attempting to decode the intermediate response OID: %s
 ERR_LDAP_INTERMEDIATE_RESPONSE_CANNOT_DECODE_VALUE_317=An error occurred \
- while attempting to decode the intermediate response value:  %s
+ while attempting to decode the intermediate response value: %s
 ERR_MVFILTER_INVALID_LDAP_FILTER_TYPE_321=The provided LDAP filter \
  "%s" cannot be used as a matched values filter because filters of type %s are \
  not allowed for use in matched values filters
@@ -595,26 +595,26 @@
  matched values filters
 ERR_MVFILTER_CANNOT_DECODE_AVA_324=An error occurred while attempting \
  to decode the attribute value assertion in the provided matched values \
- filter:  %s
+ filter: %s
 ERR_MVFILTER_NO_SUBSTRING_ELEMENTS_326=The provided matched values \
  filter could not be decoded because there were no subInitial, subAny, or \
  subFinal components in the substring filter
 ERR_MVFILTER_CANNOT_DECODE_SUBSTRINGS_330=The provided matched values \
  filter could not be decoded because an error occurred while decoding the \
- substring filter component:  %s
+ substring filter component: %s
 ERR_MVFILTER_CANNOT_DECODE_PRESENT_TYPE_331=The provided matched \
  values filter could not be decoded because an error occurred while decoding \
- the presence filter component:  %s
+ the presence filter component: %s
 ERR_MVFILTER_CANNOT_DECODE_EXTENSIBLE_MATCH_337=The provided matched \
  values filter could not be decoded because an error occurred while decoding \
- the extensible match filter component:  %s
+ the extensible match filter component: %s
 ERR_MVFILTER_INVALID_ELEMENT_TYPE_338=The provided matched values \
  filter could not be decoded because it had an invalid BER type of %s
 ERR_MATCHEDVALUES_NO_CONTROL_VALUE_339=Cannot decode the provided \
  matched values control because it does not have a value
 ERR_MATCHEDVALUES_CANNOT_DECODE_VALUE_AS_SEQUENCE_340=Cannot decode \
  the provided matched values control because an error occurred while \
- attempting to decode the value as an ASN.1 sequence:  %s
+ attempting to decode the value as an ASN.1 sequence: %s
 ERR_MATCHEDVALUES_NO_FILTERS_341=Cannot decode the provided matched \
  values control because the control value does not specify any filters for use \
  in matching attribute values
@@ -632,15 +632,15 @@
  same message ID of %d
 WARN_LDAP_CLIENT_CANNOT_ENQUEUE_346=The Directory Server encountered an \
  unexpected error while attempting to add the client request to the work \
- queue:  %s
+ queue: %s
 INFO_JMX_CONNHANDLER_DESCRIPTION_LISTEN_PORT_347=TCP port on \
- which this connection handler may accept administrative connections.  Changes \
+ which this connection handler may accept administrative connections. Changes \
  to this configuration attribute will not take effect until the connection \
  handler is disabled and re-enabled, or until the Directory Server is \
  restarted
 INFO_JMX_CONNHANDLER_DESCRIPTION_SSL_CERT_NICKNAME_352=Nickname \
  of the certificate that the connection handler should use when accepting \
- SSL-based connections or performing StartTLS negotiation.  Changes to this \
+ SSL-based connections or performing StartTLS negotiation. Changes to this \
  configuration attribute will not take effect until the connection handler is \
  disabled and re-enabled, or until the Directory Server is restarted
 ERR_PWPOLICYREQ_CONTROL_HAS_VALUE_354=Cannot decode the provided \
@@ -655,7 +655,7 @@
  password policy response control because the error element has an invalid \
  type of %d
 ERR_PWPOLICYRES_DECODE_ERROR_359=Cannot decode the provided password \
- policy response control:  %s
+ policy response control: %s
 INFO_PWPERRTYPE_DESCRIPTION_PASSWORD_EXPIRED_360=passwordExpired
 INFO_PWPERRTYPE_DESCRIPTION_ACCOUNT_LOCKED_361=accountLocked
 INFO_PWPERRTYPE_DESCRIPTION_CHANGE_AFTER_RESET_362=changeAfterReset
@@ -685,7 +685,7 @@
  availability response control had an unknown ACCOUNT_USABLE_RESPONSE element \
  type of %s
 ERR_ACCTUSABLERES_DECODE_ERROR_379=Cannot decode the provided account \
- availability response control:  %s
+ availability response control: %s
 ERR_ADDRESSMASK_PREFIX_DECODE_ERROR_380=Cannot decode the provided \
  address mask prefix because an invalid value was specified. The permitted \
  values for IPv4are 0 to32 and for IPv6 0 to128
@@ -702,30 +702,30 @@
  filter has an assertion value but does not include either an attribute type \
  or a matching rule ID
 ERR_LDAP_REQHANDLER_DETECTED_JVM_ISSUE_CR6322825_387=Unable to call \
- select() in the LDAP connection handler:  %s.  It appears that your JVM may \
+ select() in the LDAP connection handler: %s. It appears that your JVM may \
  be susceptible to the issue described at \
  http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6322825, and it is unable \
- to handle LDAP requests in its current configuration.  Please upgrade to a \
+ to handle LDAP requests in its current configuration. Please upgrade to a \
  newer JVM that does not exhibit this behavior (Java 5.0 Update 8 or higher) \
  or set the number of available file descriptors to a value greater than or \
  equal to 8193 (e.g., by issuing the command 'ulimit -n 8193') before starting \
  the Directory Server
 ERR_PROXYAUTH1_CONTROL_NOT_CRITICAL_388=Unwilling to process the request \
  because it contains a proxied authorization V1 control which is not marked \
- critical.  The proxied authorization control must always have a criticality \
+ critical. The proxied authorization control must always have a criticality \
  of "true"
 ERR_PROXYAUTH2_CONTROL_NOT_CRITICAL_389=Unwilling to process the request \
  because it contains a proxied authorization V2 control which is not marked \
- critical.  The proxied authorization control must always have a criticality \
+ critical. The proxied authorization control must always have a criticality \
  of "true"
 INFO_LDAP_CONNHANDLER_DESCRIPTION_KEYMANAGER_DN_390=DN of the \
  configuration entry for the key manager provider that should be used with \
- this LDAP connection handler.  Changes to this attribute will take effect \
+ this LDAP connection handler. Changes to this attribute will take effect \
  immediately, but only for subsequent attempts to access the key manager \
  provider for associated client connections
 INFO_LDAP_CONNHANDLER_DESCRIPTION_TRUSTMANAGER_DN_393=DN of the \
  configuration entry for the trust manager provider that should be used with \
- this LDAP connection handler.  Changes to this attribute will take effect \
+ this LDAP connection handler. Changes to this attribute will take effect \
  immediately, but only for subsequent attempts to access the trust manager \
  provider for associated client connections
 INFO_LDAPS_CONNHANDLER_DESCRIPTION_ENABLE_404=Specifies whether to enable the \
@@ -740,12 +740,12 @@
  ordering matching rule %s
 INFO_SORTREQ_CONTROL_CANNOT_DECODE_VALUE_410=Unable to process the provided \
  server-side sort request control because an error occurred while attempting \
- to decode the control value:  %s
+ to decode the control value: %s
 INFO_SORTRES_CONTROL_NO_VALUE_411=Unable to decode the provided control as a \
  server-side sort response control because it does not include a control value
 INFO_SORTRES_CONTROL_CANNOT_DECODE_VALUE_412=Unable to process the provided \
  server-side sort response control because an error occurred while attempting \
- to decode the control value:  %s
+ to decode the control value: %s
 INFO_SORTREQ_CONTROL_NO_ATTR_NAME_413=Unable to process the provided \
  server-side sort request control because the sort order string "%s" included \
  a sort key with no attribute name
@@ -765,19 +765,19 @@
  invalid
 INFO_VLVREQ_CONTROL_CANNOT_DECODE_VALUE_420=Unable to process the provided \
  VLV request control because an error occurred while attempting to decode the \
- control value:  %s
+ control value: %s
 INFO_VLVRES_CONTROL_NO_VALUE_421=Unable to decode the provided control as a \
  VLV response control because it does not include a control value
 INFO_VLVRES_CONTROL_CANNOT_DECODE_VALUE_423=Unable to process the provided \
  VLV response control because an error occurred while attempting to decode the \
- control value:  %s
+ control value: %s
 INFO_GETEFFECTIVERIGHTS_INVALID_AUTHZID_424=The authorization ID "%s" \
  contained in the geteffectiverights control is invalid because it does not \
  start with "dn:" to indicate a user DN
 INFO_GETEFFECTIVERIGHTS_DECODE_ERROR_425=Cannot decode the provided \
- geteffectiverights request control:  %s
+ geteffectiverights request control: %s
 ERR_LDAP_FILTER_ENCLOSED_IN_APOSTROPHES_427=An LDAP filter enclosed in \
- apostrophes is invalid:  %s
+ apostrophes is invalid: %s
 INFO_JMX_CONNHANDLER_DESCRIPTION_ENABLE_428=Specifies whether to enable the \
  JMX connection handler
 ERR_LDAP_FILTER_INVALID_CHAR_IN_ATTR_TYPE_429=The provided search filter \
@@ -786,11 +786,11 @@
 ERR_LDAP_FILTER_EXTENSIBLE_MATCH_NO_AD_OR_MR_430=The provided search \
  filter "%s" could not be decoded because the extensible match component \
  starting at position %d did not include either an attribute description or a \
- matching rule ID.  At least one of them must be provided
+ matching rule ID. At least one of them must be provided
 ERR_LDAPV2_CONTROLS_NOT_ALLOWED_431=LDAPv2 clients are not allowed to \
  use request controls
 ERR_CONNHANDLER_CANNOT_BIND_432=The %s connection handler \
- defined in configuration entry %s was unable to bind to %s:%d:  %s
+ defined in configuration entry %s was unable to bind to %s:%d: %s
 ERR_JMX_ADD_INSUFFICIENT_PRIVILEGES_434=You do not have sufficient \
  privileges to perform add operations through JMX
 ERR_JMX_DELETE_INSUFFICIENT_PRIVILEGES_435=You do not have sufficient \
@@ -814,37 +814,37 @@
  supported over internal LDAP sockets
 WARN_LDIF_CONNHANDLER_LDIF_DIRECTORY_NOT_DIRECTORY_445=The value %s \
  specified as the LDIF directory path for the LDIF connection handler defined \
- in configuration entry %s exists but is not a directory.  The specified path \
- must be a directory.  The LDIF connection handler will start, but will not \
+ in configuration entry %s exists but is not a directory. The specified path \
+ must be a directory. The LDIF connection handler will start, but will not \
  be able to proces any changes until this path is changed to a directory
 WARN_LDIF_CONNHANDLER_LDIF_DIRECTORY_MISSING_446=The directory %s \
  referenced by the LDIF connection handler defined in configuration entry %s \
- does not exist.  The LDIF connection handler will start, but will not be \
+ does not exist. The LDIF connection handler will start, but will not be \
  able to process any changes until this directory is created
 ERR_LDIF_CONNHANDLER_CANNOT_READ_CHANGE_RECORD_NONFATAL_447=An error \
- occurred while trying to read a change record from the LDIF file:  %s.  This \
+ occurred while trying to read a change record from the LDIF file: %s. This \
  change will be skipped but processing on the LDIF file will continue
 ERR_LDIF_CONNHANDLER_CANNOT_READ_CHANGE_RECORD_FATAL_448=An error \
- occurred while trying to read a change record from the LDIF file:  %s.  No \
+ occurred while trying to read a change record from the LDIF file: %s. No \
  further processing on this LDIF file can be performed
 INFO_LDIF_CONNHANDLER_UNKNOWN_CHANGETYPE_449=Unsupported change type %s
-INFO_LDIF_CONNHANDLER_RESULT_CODE_450=Result Code:  %d (%s)
-INFO_LDIF_CONNHANDLER_ERROR_MESSAGE_451=Additional Info:  %s
-INFO_LDIF_CONNHANDLER_MATCHED_DN_452=Matched DN:  %s
-INFO_LDIF_CONNHANDLER_REFERRAL_URL_453=Referral URL:  %s
+INFO_LDIF_CONNHANDLER_RESULT_CODE_450=Result Code: %d (%s)
+INFO_LDIF_CONNHANDLER_ERROR_MESSAGE_451=Additional Info: %s
+INFO_LDIF_CONNHANDLER_MATCHED_DN_452=Matched DN: %s
+INFO_LDIF_CONNHANDLER_REFERRAL_URL_453=Referral URL: %s
 ERR_LDIF_CONNHANDLER_IO_ERROR_454=An I/O error occurred while the LDIF \
- connection handler was processing LDIF file %s:  %s
+ connection handler was processing LDIF file %s: %s
 ERR_LDIF_CONNHANDLER_CANNOT_RENAME_455=An error occurred while the \
  LDIF connection handler was attempting to rename partially-processed file \
- from %s to %s:  %s
+ from %s to %s: %s
 ERR_LDIF_CONNHANDLER_CANNOT_DELETE_456=An error occurred while the \
- LDIF connection handler was attempting to delete processed file %s:  %s
+ LDIF connection handler was attempting to delete processed file %s: %s
 ERR_CONNHANDLER_ADDRESS_INUSE_457=Address already in use
 ERR_SUBENTRIES_NO_CONTROL_VALUE_458=Cannot decode the provided \
  subentries control because it does not have a value
 ERR_SUBENTRIES_CANNOT_DECODE_VALUE_459=Cannot decode the provided \
  subentries control because an error occurred while attempting \
- to decode the control value:  %s
+ to decode the control value: %s
 ERR_SNMP_CONNHANDLER_NO_CONFIGURATION_1462=No Configuration was defined \
  for this connection handler. The configuration parameters ds-cfg-listen-port \
  and ds-cfg-trap-port are required by the connection handler to start
@@ -865,24 +865,24 @@
  subtree delete control because it contains a value
 ERR_CONNHANDLER_SSL_CANNOT_INITIALIZE_1504=An error occurred \
  while attempting to initialize the SSL context for use in the LDAP \
- Connection Handler:  %s
+ Connection Handler: %s
 ERR_LDAP_UNSUPPORTED_PROTOCOL_VERSION_1505=The Directory Server does not \
- support LDAP protocol version %d.  This connection will be closed
+ support LDAP protocol version %d. This connection will be closed
 ERR_SNMP_CONNHANDLER_OPENDMK_JARFILES_DOES_NOT_EXIST_1506=The specified \
- OpenDMK jar file '%s' could not be found.  Verify that the value set in the \
+ OpenDMK jar file '%s' could not be found. Verify that the value set in the \
  opendmk-jarfile configuration parameter of the SNMP connection handler is the \
  valid path to the jdmkrt.jar file and that the file is accessible
 ERR_SNMP_CONNHANDLER_OPENDMK_JARFILES_NOT_OPERATIONAL_1507=The required \
- classes could not be loaded using jar file '%s'.  Verify that the jar file \
+ classes could not be loaded using jar file '%s'. Verify that the jar file \
  is not corrupted
 ERR_CANNOT_DECODE_CONTROL_VALUE_1508=Cannot decode the provided \
  control %s because an error occurred while attempting to \
- decode the control value:  %s
+ decode the control value: %s
 ERR_ECLN_NO_CONTROL_VALUE_1509=Cannot decode the provided entry changelog \
  notification control because it does not have a value
 ERR_ECLN_CANNOT_DECODE_VALUE_1510=Cannot decode the provided entry \
  changelog notification control because an error occurred while attempting to \
- decode the control value:  %s
+ decode the control value: %s
 ERR_UNEXPECTED_CONNECTION_CLOSURE_1511=The connection to the Directory \
 Server was closed while waiting for a response
 INFO_ERGONOMIC_SIZING_OF_REQUEST_HANDLER_THREADS_1512=Connection handler '%s' \
diff --git a/opendj3-server-dev/src/messages/messages/quicksetup.properties b/opendj3-server-dev/src/messages/messages/quicksetup.properties
index 806240e..431aee4 100644
--- a/opendj3-server-dev/src/messages/messages/quicksetup.properties
+++ b/opendj3-server-dev/src/messages/messages/quicksetup.properties
@@ -72,27 +72,27 @@
  port could be already in use by another application or maybe you do not have \
  the rights to access it.
 INFO_CANNOT_CONNECT_TO_REMOTE_AUTHENTICATION=The provided credentials are not \
- valid in server %s.  Details: %s
-INFO_CANNOT_CONNECT_TO_REMOTE_GENERIC=Could not connect to %s.  Check that the \
+ valid in server %s. Details: %s
+INFO_CANNOT_CONNECT_TO_REMOTE_GENERIC=Could not connect to %s. Check that the \
  server is running and that the provided credentials are valid.%nError \
  details:%n%s
 ERR_CANNOT_CONNECT_TO_REMOTE_COMMUNICATION=Could not connect to \
  %s. Check that the server is running and that it is accessible \
- from the local machine.  Details: %s
+ from the local machine. Details: %s
 INFO_CANNOT_CONNECT_TO_REMOTE_PERMISSIONS=You do not have enough access \
  rights to read the configuration in %s. %nProvide credentials with enough \
- rights.  Details: %s
+ rights. Details: %s
 ERR_CANNOT_CONNECT_TO_LOCAL_AUTHENTICATION=The provided credentials are \
- not valid.  Details: %s
-ERR_CANNOT_CONNECT_TO_LOCAL_GENERIC=Could not connect to the server.  \
+ not valid. Details: %s
+ERR_CANNOT_CONNECT_TO_LOCAL_GENERIC=Could not connect to the server. \
  Check that the server is running and that the provided credentials are \
  valid.%nError details:%n%s
 ERR_CANNOT_CONNECT_TO_LOCAL_COMMUNICATION=Could not connect to the \
- server.  Check that the server is running.  Details: %s
+ server. Check that the server is running. Details: %s
 ERR_CANNOT_CONNECT_TO_LOCAL_PERMISSIONS=You do not have enough access \
  rights to read the configuration in the server. %nProvide credentials \
- with enough rights.  Details: %s
-INFO_CANNOT_UPDATE_SECURITY_WARNING=Disabled.  A valid keytool command could \
+ with enough rights. Details: %s
+INFO_CANNOT_UPDATE_SECURITY_WARNING=Disabled. A valid keytool command could \
  not be found.
 INFO_CANNOT_USE_DEFAULT_PORT=Could not use 389. Port in use or user not \
  authorized.
@@ -115,11 +115,11 @@
 INFO_CERTIFICATE_DIALOG_TITLE=Certificate Not Trusted
 INFO_CERTIFICATE_EXCEPTION=You must accept the certificate presented by \
  %s:%s.
-INFO_ERROR_READING_CONFIG_LDAP_CERTIFICATE=Error reading data from server.  \
+INFO_ERROR_READING_CONFIG_LDAP_CERTIFICATE=Error reading data from server. \
  There is an error with the certificate presented by the server.\nDetails: \
  %s
 INFO_ERROR_READING_CONFIG_LDAP_CERTIFICATE_SERVER=Error reading data from \
- server %s.  There is an error with the certificate presented by the \
+ server %s. There is an error with the certificate presented by the \
  server.\nDetails: %s
 INFO_CERTIFICATE_EXPIRED=%s - Expired
 INFO_CERTIFICATE_EXPIRES_ON_LABEL=Expires On:
@@ -136,7 +136,7 @@
  certificate for the purpose of identifying the server %s:%s?
 INFO_CERTIFICATE_NAME_MISMATCH_TEXT_CLI=The Certificate presented by the server \
  %s:%s could not be trusted.\nThere is a name mismatch between the name of \
- the server (%s) and the subject DN of the certificate.  This could be caused \
+ the server (%s) and the subject DN of the certificate. This could be caused \
  because you are connected to a server pretending to be %s:%s.\n\
  Before accepting this certificate, you should examine the server's \
  certificate carefully.
@@ -233,9 +233,9 @@
 INFO_DIV_OPEN_SUCCESSFUL_BACKGROUND_3_COLOR=E1E1A7
 INFO_DOWNLOADING=Downloading...
 INFO_DOWNLOADING_ERROR=An error occurred downloading remote file(s) %s.
-INFO_DOWNLOADING_ERROR_NO_SERVICE_FOUND=An error occurred.  Could not find \
- service '%s'.   Setup using JNLP is not supported with your JDK \
- installation.  Download a ZIP installation, un-zip it and run script %s to \
+INFO_DOWNLOADING_ERROR_NO_SERVICE_FOUND=An error occurred. Could not find \
+ service '%s'. Setup using JNLP is not supported with your JDK \
+ installation. Download a ZIP installation, un-zip it and run script %s to \
  install the server.
 INFO_DOWNLOADING_RATIO=Downloading: %s%% Completed.
 INFO_EMPTY_ADMINISTRATOR_UID=You must provide a Global Administrative User \
@@ -246,7 +246,7 @@
 INFO_EMPTY_REMOTE_DN=You must provide a value for the Administrative User.
 INFO_EMPTY_REMOTE_HOST=You must provide the fully qualified name of the host.
 INFO_EMPTY_REMOTE_PWD=You must provide an Admin User password.
-INFO_EMPTY_SERVER_LOCATION=Invalid Directory Selected.  You must provide a \
+INFO_EMPTY_SERVER_LOCATION=Invalid Directory Selected. You must provide a \
  valid server root installation directory.
 INFO_ENABLE_SSL=Enable SSL on LDAP Port %s
 INFO_ENABLE_SSL_LABEL=Enable SSL on Port:
@@ -262,10 +262,10 @@
  communication.
 INFO_ADMIN_CONNECTOR_VALUE_SEVERAL_TIMES=You must specify different ports for \
  the Administration Connector Port and the other listeners.
-INFO_ERROR_ACCESSING_JKS_KEYSTORE=Could not access the JKS key store.  Check \
+INFO_ERROR_ACCESSING_JKS_KEYSTORE=Could not access the JKS key store. Check \
  that the contents of the file correspond to a valid JKS key store, that you \
  have access rights to it and that the provided PIN is valid.
-INFO_ERROR_ACCESSING_JCEKS_KEYSTORE=Could not access the JCEKS key store.  \
+INFO_ERROR_ACCESSING_JCEKS_KEYSTORE=Could not access the JCEKS key store. \
  Check that the running Java installation supports JCEKS, that the contents of \
  the file correspond to a valid JCEKS key store, that you have access rights \
  to it and that the provided PIN is valid.
@@ -295,33 +295,33 @@
 INFO_ERROR_CREATING_BASE_ENTRY=Error Creating Base Entry.
 INFO_ERROR_CREATING_BUILD_INFO=Error determining the server build information.
 INFO_ERROR_CREATING_BUILD_INFO_MSG=Error determining the server build \
- information.  Details: %s
+ information. Details: %s
 INFO_ERROR_CREATING_TEMP_FILE=An error occurred creating the temporary file.
-INFO_ERROR_DELETING_DIRECTORY=Error deleting directory %s.  Check that you \
+INFO_ERROR_DELETING_DIRECTORY=Error deleting directory %s. Check that you \
  have the rights to delete this directory and that there is no other \
  application using it.
-INFO_ERROR_DELETING_FILE=Error deleting file %s.  Check that you have the \
+INFO_ERROR_DELETING_FILE=Error deleting file %s. Check that you have the \
  rights to delete this file and that there is no other application using it.
-INFO_ERROR_DISABLING_WINDOWS_SERVICE=Error Disabling Windows service.  Try to \
+INFO_ERROR_DISABLING_WINDOWS_SERVICE=Error Disabling Windows service. Try to \
  kill the process opendj_service.exe and then running the \
  %s\\bat\\windows-service.bat -d command-line to disable the service manually.
 INFO_ERROR_DURING_INITIALIZATION_LOG=Error during the initialization with \
- contents from server %s.  Last log details: %s.  Task state: %s.  Check the \
+ contents from server %s. Last log details: %s. Task state: %s. Check the \
  error logs of %s for more information.
 INFO_ERROR_DURING_INITIALIZATION_NO_LOG=Error during the initialization with \
- contents from server %s.  Task state: %s.  Check the error logs of %s \
+ contents from server %s. Task state: %s. Check the error logs of %s \
  for more information.
-INFO_ERROR_EMPTY_RESPONSE=ERROR:  The response value may not be an empty \
+INFO_ERROR_EMPTY_RESPONSE=ERROR: The response value may not be an empty \
  string
 INFO_ERROR_ENABLING_WINDOWS_SERVICE=Error Enabling Windows service.
-INFO_ERROR_FAILED_MOVING_FILE=Failed to move file %s to %s.  Make sure this \
+INFO_ERROR_FAILED_MOVING_FILE=Failed to move file %s to %s. Make sure this \
  file is not currently locked by another application.
 # Only translate if the image is specific to the local
 INFO_ERROR_ICON=images/error_small.gif
 INFO_ERROR_ICON_DESCRIPTION=Error.
 INFO_ERROR_ICON_TOOLTIP=Error
 INFO_ERROR_IMPORT_AUTOMATICALLY_GENERATED=Error Importing \
- Automatically-Generated Data when invoked with arguments %s:  %s.
+ Automatically-Generated Data when invoked with arguments %s: %s.
 INFO_ERROR_IMPORT_LDIF_TOOL_RETURN_CODE=The import LDIF tool returned error \
  code %s.
 INFO_ERROR_IMPORTING_LDIF=Error Importing LDIF File.
@@ -349,23 +349,23 @@
  Details:%n%s
 INFO_ERROR_RENAMING_FILE=Error renaming file %s to %s.
 INFO_ERROR_STARTING_SERVER=Error Starting Directory Server.
-INFO_ERROR_STARTING_SERVER_CODE=Error Starting Directory Server.  Error code: \
+INFO_ERROR_STARTING_SERVER_CODE=Error Starting Directory Server. Error code: \
  %s.
 INFO_ERROR_STARTING_SERVER_IN_UNIX=Could not connect to the server after \
- after requesting start.  Verify that the server has access rights to port %s.
+ after requesting start. Verify that the server has access rights to port %s.
 INFO_ERROR_STARTING_SERVER_IN_WINDOWS=Could not connect to the server after \
- requesting start.  If you have a firewall configured check that it allows \
+ requesting start. If you have a firewall configured check that it allows \
  connections to port %s.
 INFO_ERROR_STOPPING_SERVER=Error Stopping Directory Server.
-INFO_ERROR_STOPPING_SERVER_CODE=Error Stopping Directory Server.  Error code: \
+INFO_ERROR_STOPPING_SERVER_CODE=Error Stopping Directory Server. Error code: \
  %s.
 INFO_ERROR_TITLE=Error
 INFO_ERROR_ZIP_STREAM=An unexpected error occurred reading the zip file %s.
-INFO_ERROR_ZIPINPUTSTREAMNULL=Could not retrieve zip file %s.  The input \
+INFO_ERROR_ZIPINPUTSTREAMNULL=Could not retrieve zip file %s. The input \
  stream is null.
 INFO_EXCEPTION_DETAILS=Details: %s
 INFO_EXCEPTION_OUT_OF_MEMORY_DETAILS=Not enough memory to perform the \
- operation.  Details: %s
+ operation. Details: %s
 INFO_EXCEPTION_ROOT_CAUSE=Root Cause:
 # Only translate if the color is specific to the local
 INFO_FIELD_INVALID_COLOR=255,000,000
@@ -443,11 +443,11 @@
 INFO_INSTALLSTATUS_CONFIGFILEMODIFIED=Has already been configured
 INFO_INSTALLSTATUS_DBFILEEXIST=Contains data
 INFO_INSTALLSTATUS_INSTALLED=Server Already Configured<br> The setup \
- can only be used with servers that have not yet been configured.  The \
+ can only be used with servers that have not yet been configured. The \
  current server:%s
 INFO_INSTALLSTATUS_INSTALLED_CLI=Server Already Configured%n %s \
  command-line can only be used with servers that have not yet been \
- configured.  The current server:%s
+ configured. The current server:%s
 INFO_INSTALLSTATUS_NOT_INSTALLED=The Directory Server is not installed.
 INFO_INSTALLSTATUS_SERVERRUNNING=Is currently running on port %s
 # Only translate if the color is specific to the local
@@ -472,13 +472,13 @@
 INFO_JKS_CERTIFICATE_TOOLTIP=Select this option if you have a JKS \
  certificate.
 INFO_JKS_KEYSTORE_DOES_NOT_EXIST=No certificates for the Java Key Store could \
- be found.  Check that the provided path is valid.
+ be found. Check that the provided path is valid.
 INFO_JCEKS_CERTIFICATE=Use existing JCEKS File
 INFO_JCEKS_CERTIFICATE_LABEL=JCEKS File
 INFO_JCEKS_CERTIFICATE_TOOLTIP=Select this option if you have a JCEKS \
  certificate.
 INFO_JCEKS_KEYSTORE_DOES_NOT_EXIST=No certificates for the Java Key Store could \
- be found.  Check that the provided path is valid.
+ be found. Check that the provided path is valid.
 INFO_KEYSTORE_PATH_DOES_NOT_EXIST=The provided key store path does not exist.
 INFO_KEYSTORE_PATH_LABEL=Key Store Path:
 INFO_KEYSTORE_PATH_NOT_A_FILE=The provided key store path is not a file.
@@ -545,14 +545,14 @@
 INFO_PKCS11_CERTIFICATE_TOOLTIP=Select this option if you have a PKCS#11 \
  token.
 INFO_PKCS11_KEYSTORE_DOES_NOT_EXIST=No certificates for the PCKS#11 key store \
- could be found.  Check that is installed, that you have access rights to it \
+ could be found. Check that is installed, that you have access rights to it \
  and that the key store contains certificates.
 INFO_PKCS12_CERTIFICATE=Use existing PKCS#12 File
 INFO_PKCS12_CERTIFICATE_LABEL=PKCS#12 File
 INFO_PKCS12_CERTIFICATE_TOOLTIP=Select this option if you have a PKCS#12 \
  certificate.
 INFO_PKCS12_KEYSTORE_DOES_NOT_EXIST=No certificates for the PCKS#12 key store \
- could be found.  Check that the provided path and PIN are valid and that \
+ could be found. Check that the provided path and PIN are valid and that \
  the key store contains certificates.
 INFO_PREVIOUS_BUTTON_LABEL=< Previous
 INFO_PREVIOUS_BUTTON_TOOLTIP=Go to Previous Step
@@ -564,7 +564,7 @@
 INFO_PROGRESS_CREATING_REPLICATED_BACKENDS=Creating Replicated Base DNs
 INFO_PROGRESS_CONFIGURING_REPLICATION_REMOTE=Configuring Replication on %s
 INFO_WARNING_SERVERS_CLOCK_DIFFERENCE=The clocks of servers %s and %s have a \
- difference superior to %s minutes.  Replication does not require clocks to \
+ difference superior to %s minutes. Replication does not require clocks to \
  be synchronized but monitoring of replication updates between servers can be \
  difficult.
 INFO_PROGRESS_COPYING_FILE=Copying file %s to %s
@@ -637,7 +637,7 @@
 INFO_REMOTE_ADS_EXCEPTION=An unexpected error occurred managing the \
  registration information in %s.%nThe error is: %s
 INFO_REMOTE_REPLICATION_PORT_ALREADY_CHOSEN_FOR_OTHER_PROTOCOL=You must \
- specify a different Replication port for existing server %s.  The specified \
+ specify a different Replication port for existing server %s. The specified \
  port has already been chosen to configure the new server.
 INFO_REMOTE_REPLICATION_PORT_INSTRUCTIONS=You must provide the ports that \
  will be used to replicate data for the remote servers specified below.<br>The \
@@ -752,7 +752,7 @@
 INFO_SETUP_LAUNCHER_GUI_LAUNCHED_FAILED=%n%nThe graphical Setup launch \
  failed.%n%nLaunching command line setup...
 INFO_SETUP_LAUNCHER_GUI_LAUNCHED_FAILED_DETAILS=%n%nThe graphical Setup \
- launch failed.  Check file %s for more details.%n%nLaunching command line \
+ launch failed. Check file %s for more details.%n%nLaunching command line \
  setup...
 INFO_SETUP_LAUNCHER_LAUNCHING_GUI=Launching graphical setup...
 INFO_SHOW_EXCEPTION_DETAILS=Show Details
@@ -777,10 +777,10 @@
 INFO_SUBSECTION_RIGHT_ICON_DESCRIPTION=Decoration icon.
 INFO_SUFFIX_INITIALIZED_SUCCESSFULLY=Base DN initialized successfully.
 INFO_SUFFIX_LIST_EMPTY=-No Base DNs Found-
-INFO_SUFFIX_LIST_REPLICA_DISPLAY_ENTRIES=%s  (%s entries)
+INFO_SUFFIX_LIST_REPLICA_DISPLAY_ENTRIES=%s (%s entries)
 INFO_SUFFIX_LIST_REPLICA_DISPLAY_ENTRIES_NOT_AVAILABLE=%s (number of entries \
  not available)
-INFO_SUFFIX_LIST_REPLICA_DISPLAY_NO_ENTRIES=%s  (no entries)
+INFO_SUFFIX_LIST_REPLICA_DISPLAY_NO_ENTRIES=%s (no entries)
 INFO_SUFFIXES_STEP=Data Replication
 INFO_SUFFIXES_TO_REPLICATE_DN_TOOLTIP=The Distinguished Name (DN) of the base \
  DN to replicate.
@@ -808,17 +808,17 @@
  %s.<br><br>Visit the <a \
  href="%s"> %s Administration Guide</a> for an overview of server management and \
  configuration.<br>To see server configuration status and to perform \
- some basic administration tasks on the server, click Launch Control Panel.  \
+ some basic administration tasks on the server, click Launch Control Panel. \
  Note that you can launch this tool later using %s.<br><INPUT type="submit" \
  value="Launch Control Panel"></INPUT>
-INFO_SUMMARY_INSTALL_FINISHED_WITH_ERROR=<b>Error</b><br>An error occurred.  \
+INFO_SUMMARY_INSTALL_FINISHED_WITH_ERROR=<b>Error</b><br>An error occurred. \
  Check 'Details' text area for more information.<br>The server is %s.<br>To \
  see server configuration status and to perform basic administration tasks on \
- the server, click Launch Control Panel.  Note that you can launch \
+ the server, click Launch Control Panel. Note that you can launch \
  this tool later using %s.<br><INPUT type="submit" value="Launch Control \
  Panel"></INPUT>
 INFO_SUMMARY_INSTALL_NOT_STARTED=Starting QuickSetup...
-INFO_SUMMARY_START_ERROR=An error occurred Starting Server.  Check 'Details' \
+INFO_SUMMARY_START_ERROR=An error occurred Starting Server. Check 'Details' \
  text area for more information.
 INFO_SUMMARY_START_SUCCESS=Server Started Successfully.
 INFO_SUMMARY_STARTING=Starting Server...
@@ -881,18 +881,17 @@
 ERR_COULD_NOT_FIND_REPLICATIONID=Could not find a remote peer to \
  initialize the contents of local base DN: %s.
 ERR_ERROR_CREATING_JAVA_HOME_SCRIPTS=Error updating scripts with java \
- properties.  Error code: %d
+ properties. Error code: %d
 ERR_INCOMPATIBLE_VERSION=The minimum Java version required is %s.%n%n\
  The detected version is %s.%nThe binary detected is %s%n%nPlease set \
  OPENDJ_JAVA_HOME to the root of a compatible Java installation or edit the \
  java.properties file and then run the dsjavaproperties script to specify the \
  java version to be used.
-INFO_ADS_CONTEXT_EXCEPTION_MSG=Registration information error.  Error type: \
- '%s'.
-INFO_ADS_CONTEXT_EXCEPTION_WITH_DETAILS_MSG=Registration information error.  \
- Error type: '%s'.  Details: %s
+INFO_ADS_CONTEXT_EXCEPTION_MSG=Registration information error. Error type: '%s'.
+INFO_ADS_CONTEXT_EXCEPTION_WITH_DETAILS_MSG=Registration information error. \
+ Error type: '%s'. Details: %s
 ERR_ADS_MERGE=The registration information of server %s \
- and server %s could not be merged.  Reasons:%n%s
+ and server %s could not be merged. Reasons:%n%s
 ERR_ADS_ADMINISTRATOR_MERGE=The following administrators are defined in \
  server %s but not in server %s:%n%s%nThe merge can only be performed if these \
  administrators are defined in server %s.
@@ -915,28 +914,28 @@
 ERR_INITIAL_MEMORY_VALUE=The initial memory value must be a positive \
  integer.
 ERR_MAX_MEMORY_VALUE=The maximum memory value must be a positive integer.
-ERR_MEMORY_VALUE_EXTENDED=Could not use the provided memory values.  \
+ERR_MEMORY_VALUE_EXTENDED=Could not use the provided memory values. \
  Check that the running Java virtual machine supports to specify the %s and \
  %s arguments and that there is enough memory in the machine to use the \
  provided values.
 ERR_INITIAL_MEMORY_VALUE_EXTENDED=Could not use the provided initial \
- memory value.  Check that the running Java virtual machine supports to \
+ memory value. Check that the running Java virtual machine supports to \
  specify the %s argument and that there is enough memory in the machine to use \
  the provided value.
 ERR_MAX_MEMORY_VALUE_EXTENDED=Could not use the provided maximum memory \
- value.  Check that the running Java virtual machine supports to specify the \
+ value. Check that the running Java virtual machine supports to specify the \
  %s argument and that there is enough memory in the machine to use the \
  provided value.
 ERR_MEMORY_32_BIT_LIMIT=Note that 32-bit Java virtual machines do not \
  support memory values higher than 2 gigabytes.
 ERR_GENERIC_JAVA_ARGUMENT=Could not use the arguments '%s' using the \
- running Java virtual machine.   Check that the Java virtual machine supports \
+ running Java virtual machine. Check that the Java virtual machine supports \
  this argument.
 ERR_MAX_MEMORY_BIGGER_THAN_INITIAL_MEMORY=The maximum memory value must \
  be higher than the initial memory value.
 ERR_MEMORY_AND_OTHER_ARGUMENTS_NOT_COMPATIBLE=The provided memory \
  arguments and the 'Other Java Arguments' were checked successfully \
- separately.  However there was an error running them simultaneously.  Check \
+ separately. However there was an error running them simultaneously. Check \
  that the provided arguments are compatible with the memory values.
 INFO_JAVA_ARGUMENTS_CANNOT_BE_CHECKED_IN_WEBSTART=In the Java Webstart setup, \
  the provided Java arguments are not thoroughly tested till the server is \
@@ -970,18 +969,18 @@
 INFO_JAVA_RUNTIME_SETTINGS_TITLE=Java Runtime Settings
 INFO_IMPORT_FILE_WARNING_UPDATE_RUNTIME_ARGS=Considering the size of the \
  provided LDIF file, the default runtime settings might not be enough to \
- be able to manage that volume of data.  It is recommended to increase the \
+ be able to manage that volume of data. It is recommended to increase the \
  maximum memory allowed for both the server runtime and the import.<br><br>\
  Check the documentation for more information about how to tune the server.
 INFO_AUTOMATICALLY_GENERATED_DATA_WARNING_UPDATE_RUNTIME_ARGS=Considering the \
  number of entries that will be automatically generated and imported to the \
  server, the default runtime settings might not be enough to \
- be able to manage that volume of data.  It is recommended to increase the \
+ be able to manage that volume of data. It is recommended to increase the \
  maximum memory allowed for both the server runtime and the import.<br><br>\
  Check the documentation for more information about how to tune the server.
 INFO_REPLICATED_ENTRIES_WARNING_UPDATE_RUNTIME_ARGS=Considering the number \
  of entries defined in the suffixes of the replicated remote servers, the \
  default runtime settings might not be enough to be able to manage that \
- volume of data.  It is recommended to increase the maximum memory allowed for \
+ volume of data. It is recommended to increase the maximum memory allowed for \
  the server runtime.<br><br>Check the documentation for more information \
  about how to tune the server.
diff --git a/opendj3-server-dev/src/messages/messages/schema.properties b/opendj3-server-dev/src/messages/messages/schema.properties
index c918a36..d13198d 100644
--- a/opendj3-server-dev/src/messages/messages/schema.properties
+++ b/opendj3-server-dev/src/messages/messages/schema.properties
@@ -64,10 +64,10 @@
  Substring matching will not be allowed by default for attributes with this \
  syntax
 WARN_ATTR_SYNTAX_ILLEGAL_BOOLEAN_5=The provided value "%s" is not \
- allowed for attributes with a Boolean syntax.  The only allowed values are \
+ allowed for attributes with a Boolean syntax. The only allowed values are \
  'TRUE' and 'FALSE'
 WARN_ATTR_SYNTAX_BIT_STRING_TOO_SHORT_6=The provided value "%s" is too \
- short to be a valid bit string.  A bit string must be a series of binary \
+ short to be a valid bit string. A bit string must be a series of binary \
  digits surrounded by single quotes and followed by a capital letter B
 WARN_ATTR_SYNTAX_BIT_STRING_NOT_QUOTED_7=The provided value "%s" is not \
  a valid bit string because it is not surrounded by single quotes and followed \
@@ -110,7 +110,7 @@
  "%s" is not a valid generalized time value because it contains an invalid \
  character '%s' at position %d
 ERR_ATTR_SYNTAX_DN_INVALID_25=The provided value "%s" could not be parsed \
- as a valid distinguished name:  %s
+ as a valid distinguished name: %s
 ERR_ATTR_SYNTAX_DN_END_WITH_COMMA_26=The provided value "%s" could not be \
  parsed as a valid distinguished name because the last non-space character was \
  a comma or semicolon
@@ -158,7 +158,7 @@
 ERR_ATTR_SYNTAX_DN_ATTR_VALUE_DECODE_FAILURE_40=The provided value "%s" \
  could not be parsed as a valid distinguished name because an unexpected \
  failure occurred while attempting to parse an attribute value from one of the \
- RDN components:  "%s"
+ RDN components: "%s"
 ERR_ATTR_SYNTAX_DN_UNMATCHED_QUOTE_41=The provided value "%s" could not \
  be parsed as a valid distinguished name because one of the RDN components \
  included a quoted value that did not have a corresponding closing quotation \
@@ -212,26 +212,26 @@
  No attribute type with this OID exists in the server schema
 WARN_ATTR_SYNTAX_ATTRTYPE_UNKNOWN_APPROXIMATE_MR_62=The definition for \
  the attribute type with OID %s declared that approximate matching should be \
- performed using the matching rule "%s".  No such approximate matching rule is \
+ performed using the matching rule "%s". No such approximate matching rule is \
  configured for use in the Directory Server
 WARN_ATTR_SYNTAX_ATTRTYPE_UNKNOWN_EQUALITY_MR_63=The definition for \
  the attribute type with OID %s declared that equality matching should be \
- performed using the matching rule "%s".  No such equality matching rule is \
+ performed using the matching rule "%s". No such equality matching rule is \
  configured for use in the Directory Server
 WARN_ATTR_SYNTAX_ATTRTYPE_UNKNOWN_ORDERING_MR_64=The definition for \
  the attribute type with OID %s declared that ordering matching should be \
- performed using the matching rule "%s".  No such ordering matching rule is \
+ performed using the matching rule "%s". No such ordering matching rule is \
  configured for use in the Directory Server
 WARN_ATTR_SYNTAX_ATTRTYPE_UNKNOWN_SUBSTRING_MR_65=The definition for \
  the attribute type with OID %s declared that substring matching should be \
- performed using the matching rule "%s".  No such substring matching rule is \
+ performed using the matching rule "%s". No such substring matching rule is \
  configured for use in the Directory Server
 WARN_ATTR_SYNTAX_ATTRTYPE_UNKNOWN_SYNTAX_66=The definition for the \
  attribute type with OID %s declared that it should have a syntax with OID %s. \
  No such syntax is configured for use in the Directory Server
 WARN_ATTR_SYNTAX_ATTRTYPE_INVALID_ATTRIBUTE_USAGE_67=The definition \
  for the attribute type with OID %s declared that it should have an attribute \
- usage of %s.  This is an invalid usage
+ usage of %s. This is an invalid usage
 WARN_ATTR_SYNTAX_ATTRTYPE_EXPECTED_QUOTE_AT_POS_68=The provided value \
  "%s" could not be parsed as an attribute type description because a single \
  quote was expected at position %d but the character %s was found instead
@@ -263,17 +263,17 @@
  contained an unexpected closing parenthesis at position %d
 WARN_ATTR_SYNTAX_OBJECTCLASS_UNKNOWN_SUPERIOR_CLASS_78=The definition \
  for the objectclass with OID %s declared a superior objectclass with an OID \
- of %s.  No objectclass with this OID exists in the server schema
+ of %s. No objectclass with this OID exists in the server schema
 WARN_ATTR_SYNTAX_OBJECTCLASS_EXPECTED_QUOTE_AT_POS_79=The provided \
  value "%s" could not be parsed as an objectclass description because a single \
  quote was expected at position %d but the character %s was found instead
 WARN_ATTR_SYNTAX_OBJECTCLASS_UNKNOWN_REQUIRED_ATTR_80=The definition \
  for the objectclass with OID %s declared that it should include required \
- attribute "%s".  No attribute type matching this name or OID exists in the \
+ attribute "%s". No attribute type matching this name or OID exists in the \
  server schema
 WARN_ATTR_SYNTAX_OBJECTCLASS_UNKNOWN_OPTIONAL_ATTR_81=The definition \
  for the objectclass with OID %s declared that it should include optional \
- attribute "%s".  No attribute type matching this name or OID exists in the \
+ attribute "%s". No attribute type matching this name or OID exists in the \
  server schema
 WARN_ATTR_SYNTAX_IA5_ILLEGAL_CHARACTER_82=The provided value "%s" \
  cannot be parsed as a valid IA5 string because it contains an illegal \
@@ -294,10 +294,10 @@
  "%s" is not a valid numeric string because it contained character %s at \
  position %d that was neither a digit nor a space
 ERR_ATTR_SYNTAX_NUMERIC_STRING_EMPTY_VALUE_91=The provided value is not \
- a valid numeric string because it did not contain any characters.  A numeric \
+ a valid numeric string because it did not contain any characters. A numeric \
  string value must contain at least one numeric digit or space
 WARN_ATTR_SYNTAX_PRINTABLE_STRING_EMPTY_VALUE_105=The provided value \
- could not be parsed as a printable string because it was null or empty.  A \
+ could not be parsed as a printable string because it was null or empty. A \
  printable string must contain at least one character
 WARN_ATTR_SYNTAX_PRINTABLE_STRING_ILLEGAL_CHARACTER_106=The provided \
  value "%s" could not be parsed as a printable string because it contained an \
@@ -330,7 +330,7 @@
 ERR_ATTR_SYNTAX_UTC_TIME_INVALID_OFFSET_117=The provided value %s is not \
  a valid UTC time value because %s is not a valid GMT offset
 ERR_ATTR_SYNTAX_UTC_TIME_CANNOT_PARSE_118=The provided value %s could \
- not be parsed as a valid UTC time:  %s
+ not be parsed as a valid UTC time: %s
 ERR_ATTR_SYNTAX_DCR_EMPTY_VALUE_119=The provided value could not be \
  parsed as a valid DIT content rule description because it was empty or \
  contained only whitespace
@@ -360,14 +360,14 @@
  "%s" is associated with a structural objectclass %s that is not defined in \
  the server schema
 ERR_ATTR_SYNTAX_DCR_STRUCTURAL_CLASS_NOT_STRUCTURAL_128=The DIT content \
- rule "%s" is associated with the objectclass with OID %s (%s).  This \
+ rule "%s" is associated with the objectclass with OID %s (%s). This \
  objectclass exists in the server schema but is defined as %s rather than \
  structural
 ERR_ATTR_SYNTAX_DCR_UNKNOWN_AUXILIARY_CLASS_129=The DIT content rule \
  "%s" is associated with an auxiliary objectclass %s that is not defined in \
  the server schema
 ERR_ATTR_SYNTAX_DCR_AUXILIARY_CLASS_NOT_AUXILIARY_130=The DIT content \
- rule "%s" is associated with an auxiliary objectclass %s.  This objectclass \
+ rule "%s" is associated with an auxiliary objectclass %s. This objectclass \
  exists in the server schema but is defined as %s rather than auxiliary
 ERR_ATTR_SYNTAX_DCR_UNKNOWN_REQUIRED_ATTR_131=The DIT content rule "%s" \
  is associated with a required attribute type %s that is not defined in the \
@@ -415,11 +415,11 @@
  structural
 ERR_ATTR_SYNTAX_NAME_FORM_UNKNOWN_REQUIRED_ATTR_145=The definition for \
  the name form with OID %s declared that it should include required attribute \
- "%s".  No attribute type matching this name or OID exists in the server \
+ "%s". No attribute type matching this name or OID exists in the server \
  schema
 ERR_ATTR_SYNTAX_NAME_FORM_UNKNOWN_OPTIONAL_ATTR_146=The definition for \
  the name form with OID %s declared that it should include optional attribute \
- "%s".  No attribute type matching this name or OID exists in the server \
+ "%s". No attribute type matching this name or OID exists in the server \
  schema
 ERR_ATTR_SYNTAX_NAME_FORM_NO_STRUCTURAL_CLASS_147=The provided value \
  "%s" could not be parsed as a name form description because it does not \
@@ -565,7 +565,7 @@
  "%s" between positions %d and %d was not a valid fax parameter
 ERR_ATTR_SYNTAX_NAMEANDUID_INVALID_DN_193=The provided value "%s" could \
  not be parsed as a valid name and optional UID value because an error \
- occurred while trying to parse the DN portion:  %s
+ occurred while trying to parse the DN portion: %s
 ERR_ATTR_SYNTAX_NAMEANDUID_ILLEGAL_BINARY_DIGIT_194=The provided value \
  "%s" could not be parsed as a valid name and optional UID value because the \
  UID portion contained an illegal binary digit %s at position %d
@@ -641,9 +641,9 @@
  could not be parsed as an enhanced guide value because it did not specify any \
  criteria between the octothorpe (#) characters
 ERR_ATTR_SYNTAX_OID_INVALID_VALUE_222=The provided value %s could not be \
- parsed as a valid OID:  %s
+ parsed as a valid OID: %s
 WARN_ATTR_SYNTAX_UUID_INVALID_LENGTH_236=The provided value "%s" has \
- an invalid length for a UUID.  All UUID values must have a length of exactly \
+ an invalid length for a UUID. All UUID values must have a length of exactly \
  36 bytes, but the provided value had a length of %d bytes
 WARN_ATTR_SYNTAX_UUID_EXPECTED_DASH_237=The provided value "%s" should \
  have had a dash at position %d, but the character '%s' was found instead
@@ -738,7 +738,7 @@
  'Z' or a time zone offset
 WARN_ATTR_SYNTAX_GENERALIZED_TIME_ILLEGAL_TIME_278=The provided value \
  %s is not a valid generalized time value because it represents an invalid \
- time (e.g., a date that does not exist):  %s
+ time (e.g., a date that does not exist): %s
 NOTE_SCHEMA_IMPORT_FAILED_279=A schema element could not be imported: %s, %s
 WARN_ATTR_INVALID_COLLATION_MATCHING_RULE_LOCALE_280=The collation \
  rule %s under matching rule entry %s is invalid as the locale %s is not supported \
@@ -793,61 +793,61 @@
  character '%c' is not allowed. The acceptable values are s(second), \
  m (minute), h (hour), D (date), M(month) and Y(year)
 WARN_ATTR_INVALID_SECOND_ASSERTION_FORMAT_296=The provided \
-  value "%s" could not be parsed as a valid assertion value because "%d" is not \
-  a valid second specification
+ value "%s" could not be parsed as a valid assertion value because "%d" is not \
+ a valid second specification
 WARN_ATTR_INVALID_DATE_ASSERTION_FORMAT_297=The provided \
-  value "%s" could not be parsed as a valid assertion value because "%d" is not \
-  a valid date specification
+ value "%s" could not be parsed as a valid assertion value because "%d" is not \
+ a valid date specification
 WARN_ATTR_INVALID_MONTH_ASSERTION_FORMAT_298=The provided \
-  value "%s" could not be parsed as a valid assertion value because "%d" is not \
-  a valid month specification
+ value "%s" could not be parsed as a valid assertion value because "%d" is not \
+ a valid month specification
 WARN_ATTR_INVALID_YEAR_ASSERTION_FORMAT_299=The provided \
-  value "%s" could not be parsed as a valid assertion value because "%d" is not \
-  a valid year specification
+ value "%s" could not be parsed as a valid assertion value because "%d" is not \
+ a valid year specification
 WARN_ATTR_DUPLICATE_DATE_ASSERTION_FORMAT_300=The provided \
-  value "%s" could not be parsed as a valid assertion value because there is  \
-  conflicting  value "%d" for DD(Date) specification
+ value "%s" could not be parsed as a valid assertion value because there is \
+ conflicting value "%d" for DD(Date) specification
 WARN_ATTR_DUPLICATE_MONTH_ASSERTION_FORMAT_301=The provided \
-  value "%s" could not be parsed as a valid assertion value because there is  \
-  conflicting  value "%d" for MM(Month) specification
+ value "%s" could not be parsed as a valid assertion value because there is \
+ conflicting value "%d" for MM(Month) specification
 WARN_ATTR_DUPLICATE_YEAR_ASSERTION_FORMAT_302=The provided \
-  value "%s" could not be parsed as a valid assertion value because there is  \
-  conflicting  value "%d" for YYYY(Year) specification
+ value "%s" could not be parsed as a valid assertion value because there is \
+ conflicting value "%d" for YYYY(Year) specification
 WARN_ATTR_CONFLICTING_ASSERTION_FORMAT_304=The provided \
- value "%s" could not be parsed as a valid assertion value because more than  \
+ value "%s" could not be parsed as a valid assertion value because more than \
  one time units are not allowed
 ERR_ATTR_SYNTAX_LDAPSYNTAX_UNKNOWN_EXT_306=The provided value "%s" \
  could not be parsed as an ldap syntax because it contains an unrecognized \
  extension %s at position %d
 WARN_ATTR_SYNTAX_LDAPSYNTAX_REGEX_INVALID_VALUE_307=The provided value \
-  "%s" cannot be parsed as a valid regex syntax because it does not match  \
-  the pattern "%s"
+ "%s" cannot be parsed as a valid regex syntax because it does not match \
+ the pattern "%s"
 WARN_ATTR_SYNTAX_LDAPSYNTAX_REGEX_NO_PATTERN_308=The provided value "%s" \
  could not be parsed as a regex syntax because it does not contain a regex pattern
 WARN_ATTR_SYNTAX_LDAPSYNTAX_REGEX_INVALID_PATTERN_309=The provided value \
-  "%s" could not be parsed as a regex syntax because the provided regex \
+ "%s" could not be parsed as a regex syntax because the provided regex \
  pattern "%s" is invalid
 WARN_ATTR_SYNTAX_LDAPSYNTAX_ENUM_INVALID_VALUE_310=The provided value \
-  "%s" cannot be parsed because it is not allowed by enumeration syntax \
-  with OID "%s"
+ "%s" cannot be parsed because it is not allowed by enumeration syntax \
+ with OID "%s"
 WARN_ATTR_SYNTAX_LDAPSYNTAX_ENUM_DUPLICATE_VALUE_311=The provided value \
-  "%s" cannot be parsed as an enumeration syntax  because it contains a \
-  duplicate value "%s" at position %d
+ "%s" cannot be parsed as an enumeration syntax because it contains a \
+ duplicate value "%s" at position %d
 WARN_ATTR_INVALID_MINUTE_ASSERTION_FORMAT_312=The provided \
-  value "%s" could not be parsed as a valid assertion value because "%d" is not \
-  a valid minute specification
+ value "%s" could not be parsed as a valid assertion value because "%d" is not \
+ a valid minute specification
 WARN_ATTR_INVALID_HOUR_ASSERTION_FORMAT_313=The provided \
-  value "%s" could not be parsed as a valid assertion value because "%d" is not \
-  a valid hour specification
+ value "%s" could not be parsed as a valid assertion value because "%d" is not \
+ a valid hour specification
 WARN_ATTR_DUPLICATE_SECOND_ASSERTION_FORMAT_314=The provided \
-  value "%s" could not be parsed as a valid assertion value because there is  \
-  conflicting  value "%d" for s(Second) specification
+ value "%s" could not be parsed as a valid assertion value because there is \
+ conflicting value "%d" for s(Second) specification
 WARN_ATTR_DUPLICATE_MINUTE_ASSERTION_FORMAT_315=The provided \
-  value "%s" could not be parsed as a valid assertion value because there is  \
-  conflicting  value "%d" for m(Minute) specification
+ value "%s" could not be parsed as a valid assertion value because there is \
+ conflicting value "%d" for m(Minute) specification
 WARN_ATTR_DUPLICATE_HOUR_ASSERTION_FORMAT_316=The provided \
-  value "%s" could not be parsed as a valid assertion value because there is  \
-  conflicting  value "%d" for h(Hour) specification
+ value "%s" could not be parsed as a valid assertion value because there is \
+ conflicting value "%d" for h(Hour) specification
 ERR_ATTR_SYNTAX_LDAPSYNTAX_EMPTY_VALUE_317=The provided value could not \
  be parsed as a valid ldap syntax description because it was empty or \
  contained only whitespace
@@ -899,7 +899,7 @@
  an X.509 certificate: "%s"
 ERR_CERTIFICATE_MATCH_INVALID_DN_336=The provided value "%s" could \
  not be parsed as a valid distinguished name because an error occurred while \
- trying to parse the DN portion:  %s
+ trying to parse the DN portion: %s
 ERR_CERTIFICATE_MATCH_IDENTIFIER_NOT_FOUND_337=The identifier "%s" could \
  not be found at the correct position
 ERR_CERTIFICATE_MATCH_EXPECTED_END_338=The GSER value contains additional \
diff --git a/opendj3-server-dev/src/messages/messages/task.properties b/opendj3-server-dev/src/messages/messages/task.properties
index 6256a8c..294f129 100644
--- a/opendj3-server-dev/src/messages/messages/task.properties
+++ b/opendj3-server-dev/src/messages/messages/task.properties
@@ -54,7 +54,7 @@
 INFO_TASK_SHUTDOWN_DEFAULT_MESSAGE_3=The Directory Server shutdown process \
  has been initiated by task %s
 INFO_TASK_SHUTDOWN_CUSTOM_MESSAGE_4=The Directory Server shutdown process has \
- been initiated by task %s:  %s
+ been initiated by task %s: %s
 ERR_TASK_ADDSCHEMAFILE_NO_FILENAME_5=Unable to add one or more files \
  to the server schema because no schema file names were provided in attribute \
  %s of task entry %s
@@ -63,10 +63,10 @@
  schema directory %s
 ERR_TASK_ADDSCHEMAFILE_ERROR_CHECKING_FOR_FILE_7=Unable to add one or \
  more files to the server schema because an error occurred while attempting to \
- determine whether file %s exists in schema directory %s:  %s
+ determine whether file %s exists in schema directory %s: %s
 ERR_TASK_ADDSCHEMAFILE_ERROR_LOADING_SCHEMA_FILE_8=An error occurred \
  while attempting to load the contents of schema file %s into the server \
- schema:  %s
+ schema: %s
 ERR_TASK_ADDSCHEMAFILE_CANNOT_LOCK_SCHEMA_9=Unable to add one or more \
  files to the server schema because the server was unable to obtain a write \
  lock on the schema entry %s after multiple attempts
@@ -86,7 +86,7 @@
  sufficient privileges to initiate a Directory Server shutdown
 ERR_TASK_ADDSCHEMAFILE_CANNOT_NOTIFY_SYNC_PROVIDER_17=An error \
  occurred while attempting to notify a synchronization provider of type %s \
- about the schema changes made by the add schema file task:  %s
+ about the schema changes made by the add schema file task: %s
 ERR_TASK_INDEXREBUILD_INSUFFICIENT_PRIVILEGES_18=You do not have \
  sufficient privileges to initiate an index rebuild
 ERR_TASK_INITIALIZE_INVALID_DN_20=Invalid DN provided with the \
@@ -95,7 +95,7 @@
  privilege may place the server in lockdown mode
 ERR_TASK_ENTERLOCKDOWN_NOT_LOOPBACK_22=Only users with the \
  SERVER_LOCKDOWN privilege connected from a loopback address may place the \
-  server in lockdown mode
+ server in lockdown mode
 ERR_TASK_LEAVELOCKDOWN_NOT_ROOT_23=Only users with the SERVER_LOCKDOWN \
  privilege may cause the server to leave lockdown mode
 ERR_TASK_LEAVELOCKDOWN_NOT_LOOPBACK_24=Only users with the \
@@ -184,7 +184,7 @@
 INFO_FAILED_DEPENDENCY_ACTION_PROCESS_99=Process
 INFO_FAILED_DEPENDENCY_ACTION_CANCEL_100=Cancel
 INFO_FAILED_DEPENDENCY_ACTION_DISABLE_101=Disable
-INFO_TASK_STOPPED_BY_ADMIN_102=Task was stopped by an administrator:  %s
+INFO_TASK_STOPPED_BY_ADMIN_102=Task was stopped by an administrator: %s
 ERR_TASK_INITIALIZE_INVALID_GENERATION_ID_103=Invalid generation ID provided with the \
  task
 INFO_IMPORT_ARG_TEMPLATE_FILE_104=Template File
diff --git a/opendj3-server-dev/src/messages/messages/utility.properties b/opendj3-server-dev/src/messages/messages/utility.properties
index b0098b4..a9dfe1c 100644
--- a/opendj3-server-dev/src/messages/messages/utility.properties
+++ b/opendj3-server-dev/src/messages/messages/utility.properties
@@ -68,42 +68,42 @@
  the first line does not contain a DN (the first line was "%s"
 ERR_LDIF_INVALID_DN_9=Unable to parse LDIF entry starting at line %d \
  because an error occurred while trying to parse the value of line "%s" as a \
- distinguished name:  %s
+ distinguished name: %s
 ERR_LDIF_COULD_NOT_BASE64_DECODE_DN_11=Unable to parse LDIF entry \
  starting at line %d because it was not possible to base64-decode the DN on \
- line "%s":  %s
+ line "%s": %s
 ERR_LDIF_COULD_NOT_BASE64_DECODE_ATTR_12=Unable to parse LDIF entry %s \
  starting at line %d because it was not possible to base64-decode the \
- attribute on line "%s":  %s
+ attribute on line "%s": %s
 WARN_LDIF_DUPLICATE_OBJECTCLASS_13=Entry %s read from LDIF starting at \
- line %d includes a duplicate objectclass value %s.  The second occurrence of \
+ line %d includes a duplicate objectclass value %s. The second occurrence of \
  that objectclass has been skipped
 WARN_LDIF_DUPLICATE_ATTR_14=Entry %s read from LDIF starting at line %d \
- includes a duplicate attribute %s with value %s.  The second occurrence of \
+ includes a duplicate attribute %s with value %s. The second occurrence of \
  that attribute value has been skipped
 ERR_LDIF_MULTIPLE_VALUES_FOR_SINGLE_VALUED_ATTR_15=Entry %s starting at \
  line %d includes multiple values for single-valued attribute %s
 ERR_LDIF_SCHEMA_VIOLATION_17=Entry %s read from LDIF starting at line %d \
- is not valid because it violates the server's schema configuration:  %s
+ is not valid because it violates the server's schema configuration: %s
 ERR_LDIF_FILE_EXISTS_18=The specified LDIF file %s already exists and \
  the export configuration indicates that no attempt should be made to append \
  to or replace the file
 ERR_LDIF_INVALID_URL_19=Unable to parse LDIF entry %s starting at line \
  %d because the value of attribute %s was to be read from a URL but the URL \
- was invalid:  %s
+ was invalid: %s
 ERR_LDIF_URL_IO_ERROR_20=Unable to parse LDIF entry %s starting at line \
  %d because the value of attribute %s was to be read from URL %s but an error \
- occurred while trying to read that content:  %s
+ occurred while trying to read that content: %s
 ERR_REJECT_FILE_EXISTS_21=The specified reject file %s already exists \
  and the import configuration indicates that no attempt should be made to \
  append to or replace the file
 ERR_LDIF_COULD_NOT_EVALUATE_FILTERS_FOR_IMPORT_22=An error occurred \
  while attempting to determine whether LDIF entry "%s" starting at line %d \
  should be imported as a result of the include and exclude filter \
- configuration:  %s
+ configuration: %s
 ERR_LDIF_COULD_NOT_EVALUATE_FILTERS_FOR_EXPORT_23=An error occurred \
  while attempting to determine whether LDIF entry "%s" should be exported as a \
- result of the include and exclude filter configuration:  %s
+ result of the include and exclude filter configuration: %s
 ERR_LDIF_INVALID_DELETE_ATTRIBUTES_24=Error in the LDIF change record \
  entry. Invalid attributes specified for the delete operation
 ERR_LDIF_NO_MOD_DN_ATTRIBUTES_25=Error in the LDIF change record \
@@ -131,7 +131,7 @@
  contain a valid schema element name or OID because the numeric OID contains \
  two consecutive periods at position %d
 ERR_ARG_NO_IDENTIFIER_35=The %s argument does not have either a \
- single-character or a long identifier that may be used to specify it.  At \
+ single-character or a long identifier that may be used to specify it. At \
  least one of these must be specified for each argument
 ERR_ARG_NO_VALUE_PLACEHOLDER_36=The %s argument is configured to take \
  a value but no value placeholder has been defined for it
@@ -162,11 +162,11 @@
 ERR_FILEARG_NO_SUCH_FILE_48=The file %s specified for argument %s does \
  not exist
 ERR_FILEARG_CANNOT_VERIFY_FILE_EXISTENCE_49=An error occurred while \
- trying to verify the existence of file %s specified for argument %s:  %s
+ trying to verify the existence of file %s specified for argument %s: %s
 ERR_FILEARG_CANNOT_OPEN_FILE_50=An error occurred while trying to open \
- file %s specified for argument %s for reading:  %s
+ file %s specified for argument %s for reading: %s
 ERR_FILEARG_CANNOT_READ_FILE_51=An error occurred while trying to read \
- from file %s specified for argument %s:  %s
+ from file %s specified for argument %s: %s
 ERR_FILEARG_EMPTY_FILE_52=The file %s specified for argument %s exists \
  but is empty
 ERR_ARGPARSER_DUPLICATE_SHORT_ID_53=Cannot add argument %s to the \
@@ -176,9 +176,9 @@
  argument list because its long identifier --%s conflicts with the %s argument \
  that has already been defined
 ERR_ARGPARSER_CANNOT_READ_PROPERTIES_FILE_55=An error occurred while \
- attempting to read the contents of the argument properties file %s:  %s
+ attempting to read the contents of the argument properties file %s: %s
 ERR_ARGPARSER_TOO_MANY_TRAILING_ARGS_56=The provided set of \
- command-line arguments contained too many unnamed trailing arguments.  The \
+ command-line arguments contained too many unnamed trailing arguments. The \
  maximum number of allowed trailing arguments is %d
 ERR_ARGPARSER_LONG_ARG_WITHOUT_NAME_57=The provided argument "%s" is \
  invalid because it does not include the argument name
@@ -187,7 +187,7 @@
 ERR_ARGPARSER_NO_VALUE_FOR_ARGUMENT_WITH_LONG_ID_59=Argument --%s \
  requires a value but none was provided
 ERR_ARGPARSER_VALUE_UNACCEPTABLE_FOR_LONG_ID_60=The provided value \
- "%s" for argument --%s is not acceptable:  %s
+ "%s" for argument --%s is not acceptable: %s
 ERR_ARGPARSER_NOT_MULTIVALUED_FOR_LONG_ID_61=The argument --%s was \
  included multiple times in the provided set of arguments but it does not \
  allow multiple values
@@ -200,7 +200,7 @@
 ERR_ARGPARSER_NO_VALUE_FOR_ARGUMENT_WITH_SHORT_ID_65=Argument -%s \
  requires a value but none was provided
 ERR_ARGPARSER_VALUE_UNACCEPTABLE_FOR_SHORT_ID_66=The provided value \
- "%s" for argument -%s is not acceptable:  %s
+ "%s" for argument -%s is not acceptable: %s
 ERR_ARGPARSER_NOT_MULTIVALUED_FOR_SHORT_ID_67=The argument -%s was \
  included multiple times in the provided set of arguments but it does not \
  allow multiple values
@@ -222,9 +222,9 @@
 ERR_MOVEFILE_NOT_DIRECTORY_75=The target directory %s exists but is \
  not a directory
 ERR_EMAILMSG_INVALID_SENDER_ADDRESS_76=The provided sender address %s \
- is invalid:  %s
+ is invalid: %s
 ERR_EMAILMSG_INVALID_RECIPIENT_ADDRESS_77=The provided recipient \
- address %s is invalid:  %s
+ address %s is invalid: %s
 ERR_EMAILMSG_CANNOT_SEND_78=The specified e-mail message could not be \
  sent using any of the configured mail servers
 ERR_ARG_SUBCOMMAND_DUPLICATE_SUBCOMMAND_79=The argument parser already \
@@ -259,7 +259,7 @@
  global argument %s conflicts with the long ID for the %s argument associated \
  with subcommand %s
 ERR_SUBCMDPARSER_CANNOT_READ_PROPERTIES_FILE_92=An error occurred \
- while attempting to read the contents of the argument properties file %s:  %s
+ while attempting to read the contents of the argument properties file %s: %s
 ERR_SUBCMDPARSER_LONG_ARG_WITHOUT_NAME_93=The provided command-line \
  argument %s does not contain an argument name
 ERR_SUBCMDPARSER_NO_GLOBAL_ARGUMENT_FOR_LONG_ID_94=The provided \
@@ -269,7 +269,7 @@
 ERR_SUBCMDPARSER_NO_VALUE_FOR_ARGUMENT_WITH_LONG_ID_96=Command-line \
  argument --%s requires a value but none was given
 ERR_SUBCMDPARSER_VALUE_UNACCEPTABLE_FOR_LONG_ID_97=The provided value \
- "%s" for argument --%s is not acceptable:  %s
+ "%s" for argument --%s is not acceptable: %s
 ERR_SUBCMDPARSER_NOT_MULTIVALUED_FOR_LONG_ID_98=The argument --%s was \
  included multiple times in the provided set of arguments but it does not \
  allow multiple values
@@ -284,7 +284,7 @@
 ERR_SUBCMDPARSER_NO_VALUE_FOR_ARGUMENT_WITH_SHORT_ID_103=Argument -%s \
  requires a value but none was provided
 ERR_SUBCMDPARSER_VALUE_UNACCEPTABLE_FOR_SHORT_ID_104=The provided \
- value "%s" for argument -%s is not acceptable:  %s
+ value "%s" for argument -%s is not acceptable: %s
 ERR_SUBCMDPARSER_NOT_MULTIVALUED_FOR_SHORT_ID_105=The argument -%s was \
  included multiple times in the provided set of arguments but it does not \
  allow multiple values
@@ -324,7 +324,7 @@
  digit
 ERR_LDAPURL_CANNOT_CREATE_UTF8_STRING_119=An error occurred while \
  attempting to represent a byte array as a UTF-8 string during the course of \
- decoding a portion of an LDAP URL:  %s
+ decoding a portion of an LDAP URL: %s
 ERR_CHARSET_NO_COLON_120=Cannot decode value "%s" as a named character \
  set because it does not contain a colon to separate the name from the set of \
  characters
@@ -332,7 +332,7 @@
  because it does not contain a name
 ERR_CHARSET_CONSTRUCTOR_INVALID_NAME_CHAR_122=The named character set is \
  invalid because the provide name "%s" has an invalid character at position \
- %d.  Only ASCII alphabetic characters are allowed in the name
+ %d. Only ASCII alphabetic characters are allowed in the name
 ERR_CHARSET_NO_NAME_123=Cannot decode value "%s" as a named character \
  set because it does not contain a name to use for the character set
 ERR_CHARSET_NO_CHARS_124=Cannot decode value "%s" as a named character \
@@ -345,16 +345,16 @@
 ERR_FILEPERM_SET_NO_SUCH_FILE_141=Unable to set permissions for file %s \
  because it does not exist
 ERR_FILEPERM_SET_JAVA_EXCEPTION_143=One or more exceptions were thrown \
- in the process of updating the file permissions for %s.  Some of the \
+ in the process of updating the file permissions for %s. Some of the \
  permissions for the file may have been altered
 ERR_FILEPERM_SET_JAVA_FAILED_ALTERED_144=One or more updates to the \
- file permissions for %s failed, but at least one update was successful.  Some \
+ file permissions for %s failed, but at least one update was successful. Some \
  of the permissions for the file may have been altered
 ERR_FILEPERM_SET_JAVA_FAILED_UNALTERED_145=All of the attempts to \
- update the file permissions for %s failed.  The file should be left with its \
+ update the file permissions for %s failed. The file should be left with its \
  original permissions
 ERR_FILEPERM_INVALID_UNIX_MODE_STRING_146=The provided string %s does \
- not represent a valid UNIX file mode.  UNIX file modes must be a \
+ not represent a valid UNIX file mode. UNIX file modes must be a \
  three-character string in which each character is a numeric digit between \
  zero and seven
 ERR_EXEC_DISABLED_147=The %s command will not be allowed because the \
@@ -368,7 +368,7 @@
 INFO_GLOBAL_HELP_REFERENCE_156=See "%s --help" to get more usage help
 ERR_RENAMEFILE_CANNOT_RENAME_157=Failed to rename file %s to %s
 ERR_RENAMEFILE_CANNOT_DELETE_TARGET_158=Failed to delete target file \
- %s.  Make sure the file is not currently in use by this or another \
+ %s. Make sure the file is not currently in use by this or another \
  application
 ERR_EXPCHECK_TRUSTMGR_CLIENT_CERT_EXPIRED_159=Refusing to trust client \
  or issuer certificate '%s' because it expired on %s
@@ -380,7 +380,7 @@
  server or issuer certificate '%s' because it is not valid until %s
 WARN_LDIF_VALUE_VIOLATES_SYNTAX_163=Entry %s read from LDIF starting at \
  line %d includes value "%s" for attribute %s that is invalid according to the \
- associated syntax:  %s
+ associated syntax: %s
 ERR_SKIP_FILE_EXISTS_164=The specified skip file %s already exists and \
  the import configuration indicates that no attempt should be made to append \
  to or replace the file
@@ -406,13 +406,13 @@
 ERR_EMAIL_NO_SUCH_BODY_FILE_181=The file %s specified as the body file \
  for the e-mail message does not exist
 ERR_EMAIL_CANNOT_PROCESS_BODY_FILE_182=An error occurred while \
- attempting to process message body file %s:  %s
+ attempting to process message body file %s: %s
 ERR_EMAIL_NO_SUCH_ATTACHMENT_FILE_183=The attachment file %s does not \
  exist
 ERR_EMAIL_CANNOT_ATTACH_FILE_184=An error occurred while trying to \
- attach file %s:  %s
+ attach file %s: %s
 ERR_EMAIL_CANNOT_SEND_MESSAGE_185=An error occurred while trying to \
- send the e-mail message:  %s
+ send the e-mail message: %s
 INFO_BASE64_TOOL_DESCRIPTION_186=This utility can be used to encode and \
  decode information using base64
 INFO_BASE64_HELP_DESCRIPTION_187=Display this usage information
@@ -430,13 +430,13 @@
 INFO_BASE64_TO_RAW_FILE_DESCRIPTION_195=The path to a file to which the raw \
  base64-decoded data should be written
 ERR_BASE64_CANNOT_READ_RAW_DATA_196=An error occurred while attempting \
- to read the raw data to encode:  %s
+ to read the raw data to encode: %s
 ERR_BASE64_CANNOT_WRITE_ENCODED_DATA_197=An error occurred while \
- attempting to write the encoded data:  %s
+ attempting to write the encoded data: %s
 ERR_BASE64_CANNOT_READ_ENCODED_DATA_198=An error occurred while \
- attempting to read the base64-encoded data:  %s
+ attempting to read the base64-encoded data: %s
 ERR_BASE64_CANNOT_WRITE_RAW_DATA_199=An error occurred while \
- attempting to write the decoded data:  %s
+ attempting to write the decoded data: %s
 ERR_BASE64_UNKNOWN_SUBCOMMAND_200=Unknown subcommand %s
 INFO_GENERAL_NO_201=no
 INFO_GENERAL_YES_202=yes
@@ -468,32 +468,27 @@
 ERR_LDIF_REJECTED_BY_PLUGIN_NOMESSAGE_224=Rejecting entry %s because \
  it was rejected by a plugin
 ERR_LDIF_REJECTED_BY_PLUGIN_225=Rejecting entry %s because it was \
- rejected by a plugin:  %s
+ rejected by a plugin: %s
 INFO_LDAP_CONN_PROMPT_SECURITY_LDAP_226=LDAP
 INFO_LDAP_CONN_PROMPT_SECURITY_USE_SSL_227=LDAP with SSL
 INFO_LDAP_CONN_PROMPT_SECURITY_USE_START_TLS_228=LDAP with StartTLS
-INFO_LDAP_CONN_PROMPT_SECURITY_USE_TRUST_ALL_229=Automatically \
-  trust
+INFO_LDAP_CONN_PROMPT_SECURITY_USE_TRUST_ALL_229=Automatically trust
 INFO_LDAP_CONN_PROMPT_SECURITY_TRUSTSTORE_PATH_230=Truststore path:
-INFO_LDAP_CONN_PROMPT_SECURITY_TRUSTSTORE_PASSWORD_231=Password for \
-  truststore '%s':
+INFO_LDAP_CONN_PROMPT_SECURITY_TRUSTSTORE_PASSWORD_231=Password for truststore '%s':
 INFO_LDAP_CONN_PROMPT_SECURITY_KEYSTORE_PATH_233=Keystore path:
-INFO_LDAP_CONN_PROMPT_SECURITY_KEYSTORE_PASSWORD_234=Password for keystore \
-  '%s':
+INFO_LDAP_CONN_PROMPT_SECURITY_KEYSTORE_PASSWORD_234=Password for keystore '%s':
 INFO_LDAP_CONN_HEADING_CONNECTION_PARAMETERS_236=>>>> Specify OpenDJ LDAP \
-  connection parameters
+ connection parameters
 ERR_LDAP_CONN_BAD_HOST_NAME_237=The hostname "%s" could not be \
-  resolved. Please check you have provided the correct address
+ resolved. Please check you have provided the correct address
 ERR_LDAP_CONN_BAD_PORT_NUMBER_238=Invalid port number "%s". Please \
-  enter a valid port number between 1 and 65535
-INFO_LDAP_CONN_PROMPT_HOST_NAME_239=Directory server hostname or IP address \
-  [%s]:
+ enter a valid port number between 1 and 65535
+INFO_LDAP_CONN_PROMPT_HOST_NAME_239=Directory server hostname or IP address [%s]:
 INFO_LDAP_CONN_PROMPT_PORT_NUMBER_240=Directory server port number [%d]:
 INFO_LDAP_CONN_PROMPT_BIND_DN_241=Administrator user bind DN [%s]:
 INFO_LDAP_CONN_PROMPT_SECURITY_USE_SECURE_CTX_242=How do you want to connect?
 INFO_LDAP_CONN_PROMPT_SECURITY_PROTOCOL_DEFAULT_CHOICE_243=%d
-ERR_LDAP_CONN_PROMPT_SECURITY_INVALID_FILE_PATH_244=The provided path \
-  is not valid
+ERR_LDAP_CONN_PROMPT_SECURITY_INVALID_FILE_PATH_244=The provided path is not valid
 INFO_LDAP_CONN_PROMPT_SECURITY_TRUST_METHOD_245=How do you want to trust the server certificate?
 INFO_LDAP_CONN_PROMPT_SECURITY_TRUSTSTORE_246=Use a truststore
 INFO_LDAP_CONN_PROMPT_SECURITY_MANUAL_CHECK_247=Manually validate
@@ -516,9 +511,8 @@
 INFO_ARGPARSER_USAGE_JAVA_CLASSNAME_264=Usage:  java %s  {options}
 INFO_ARGPARSER_USAGE_JAVA_SCRIPTNAME_265=Usage:  %s  {options}
 INFO_ARGPARSER_USAGE_TRAILINGARGS_266={trailing-arguments}
-ERR_CONFIRMATION_TRIES_LIMIT_REACHED_267=Confirmation tries limit reached \
- (%d)
-ERR_UNEXPECTED_268=Unexpected error.  Details: %s
+ERR_CONFIRMATION_TRIES_LIMIT_REACHED_267=Confirmation tries limit reached (%d)
+ERR_UNEXPECTED_268=Unexpected error. Details: %s
 ERR_TRIES_LIMIT_REACHED_269=Input tries limit reached (%d)
 INFO_ADMIN_CONN_PROMPT_PORT_NUMBER_270=Directory server administration port number [%d]:
 ERR_LDIF_INVALID_ATTR_OPTION_271=Unable to parse LDIF entry %s starting \
@@ -573,5 +567,5 @@
 ERR_LDIF_READ_ATTR_SKIP_301=Skipping entry %s because the following error \
 was received when reading its attributes: %s
 ERR_LDAP_CONN_BAD_INTEGER_302=Invalid integer number "%s". Please \
-  enter a valid integer
+ enter a valid integer
 ERR_ARG_SUBCOMMAND_INVALID_303=Invalid subcommand
\ No newline at end of file
diff --git a/opendj3-server-dev/src/messages/messages/version.properties b/opendj3-server-dev/src/messages/messages/version.properties
index 6ab5395..ea96637 100644
--- a/opendj3-server-dev/src/messages/messages/version.properties
+++ b/opendj3-server-dev/src/messages/messages/version.properties
@@ -49,55 +49,55 @@
 #
 INFO_890_UPGRADE_1=With this upgrade, the Berkeley DB Java Edition JAR will be \
  upgraded to version 3.2.13 which introduces incompatibilities to the data \
- format.  Consequently if at a later time you wish to revert this installation \
+ format. Consequently if at a later time you wish to revert this installation \
  to its prior version you will have to export the data from this server and \
  reimport it once the reversion has finished
 INFO_890_REVERSION_2=With this reversion, the Berkeley DB Java Edition JAR \
  will be downgraded to an older version which uses a different data format \
- than the current version.  In order to revert this server you will have to \
+ than the current version. In order to revert this server you will have to \
  export the data from this server and reimport it after the reversion has \
  finished
 INFO_1582_UPGRADE_3=This upgrade introduces improvements to the data format \
- which are not backward compatible with the current version.  Consequently if \
+ which are not backward compatible with the current version. Consequently if \
  at a later time you wish to revert this installation to its prior version you \
  will have to export the data from this server and reimport it once the \
  reversion has finished
 INFO_1582_REVERSION_4=With this reversion the data format used to store data \
- by the server will be reverted to a prior version.  In order to revert this \
+ by the server will be reverted to a prior version. In order to revert this \
  server you will have to export the data from this server and reimport it \
  after the reversion has finished
 INFO_2049_UPGRADE_5=This upgrade introduces improvements to the data format \
- which are not backward compatible with the current version.  Consequently if \
+ which are not backward compatible with the current version. Consequently if \
  at a later time you wish to revert this installation to its prior version you \
  will have to export the data from this server and reimport it once the \
  reversion has finished
 INFO_2049_REVERSION_6=With this reversion the data format used to store data \
- by the server will be reverted to a prior version.  In order to revert this \
+ by the server will be reverted to a prior version. In order to revert this \
  server you will have to export the data from this server and reimport it \
  after the reversion has finished
 INFO_2974_UPGRADE_7=This upgrade introduces an incompatible property change \
  for the default password storage scheme and deprecated password storage \
- schemes associated with a password policy.  The schemes are now referenced \
- by DN rather than by name.  Upgrade is not possible because the scheme name \
+ schemes associated with a password policy. The schemes are now referenced \
+ by DN rather than by name. Upgrade is not possible because the scheme name \
  cannot be automatically translated into a DN
 INFO_2974_REVERSION_8=It is not possible to revert to a revision before 2974 \
  because the default password storage scheme and deprecated password storage \
  scheme references in the password policy have been converted from names to \
  DNs, and it is not possible to revert from the DN back to the scheme name
 INFO_3294_UPGRADE_9=This upgrade introduces a new security framework that is \
- not backwards compatible.  Upgrade is not possible
-INFO_3294_REVERSION_10=The revision 3294 introduces a new security framework.  \
+ not backwards compatible. Upgrade is not possible
+INFO_3294_REVERSION_10=The revision 3294 introduces a new security framework. \
  Revert is not possible
 INFO_3708_UPGRADE_11=This upgrade introduces a change in the backend \
- configuration that is not backwards compatible.  Upgrade is not possible
+ configuration that is not backwards compatible. Upgrade is not possible
 INFO_3708_REVERSION_12=The revision 3294 introduces a change in the backend \
- configuration.  Revert is not possible
+ configuration. Revert is not possible
 INFO_3873_UPGRADE_13=This change introduces a change to the way in which \
- distinguished names are normalized.  In order to upgrade this server you \
+ distinguished names are normalized. In order to upgrade this server you \
  will have to export the data from this server and reimport it after the \
  upgrade has finished
 INFO_3873_REVERSION_14=With this reversion the normalized form of \
- distinguished names will be reverted to a prior version.  In order to \
+ distinguished names will be reverted to a prior version. In order to \
  revert this server you will have to export the data from this server and \
  reimport it after the reversion has finished
 INFO_5134_UPGRADE_15=The revision 5134 introduces a change to the \
@@ -105,7 +105,7 @@
  In order to upgrade this server you will have to export the data from \
  this server and reimport it after the upgrade has finished
 INFO_5134_REVERSION_16=With this reversion the normalization of attribute \
- or assertion value will be reverted to a prior version.  In order to revert this server \
+ or assertion value will be reverted to a prior version. In order to revert this server \
  you will have to export the data from this server and reimport it after the \
  reversion has finished
 INFO_5278_REVERSION_17=Reversion from version 2.0 to a previous version is \

--
Gitblit v1.10.0