From a0afabf521251e60cfebdad08b529b439adec3b7 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 10 Feb 2014 17:15:20 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1288 :    Migrate I18n and logging support to i18n framework and SLF4J

---
 opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_zh_TW.properties                           |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/log_es.properties                                     |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/log.properties                                        |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/admin_ko.properties                                   |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/backend_fr.properties                                 |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_ja.properties                          |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_de.properties                                |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/utility.properties                                    |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_de.properties                              |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/schema_zh_CN.properties                               |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information.properties                        |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/schema_de.properties                                  |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/admin_fr.properties                                   |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_de.properties                                |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/tools_es.properties                                   |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool.properties                                 |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/core_ko.properties                                    |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_ja.properties                                     |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/utility_de.properties                                 |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/config_de.properties                                  |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/task.properties                                       |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_ko.properties                              |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/version_zh_TW.properties                              |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_es.properties                              |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/core.properties                                       |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/core_fr.properties                                    |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/config_fr.properties                                  |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_es.properties                                  |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/task_ja.properties                                    |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/version_es.properties                                 |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/version_zh_CN.properties                              |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/extension_ja.properties                               |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/jeb.properties                                        |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/extension.properties                                  |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/version_ja.properties                                 |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_zh_CN.properties                           |    2 
 opendj-sdk/opendj3-server-dev/resource/admin/example-plugin/example_plugin.properties                     |    4 
 opendj-sdk/opendj3-server-dev/src/messages/messages/config.properties                                     |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/task_es.properties                                    |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_fr.properties                              |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/core_es.properties                                    |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_fr.properties                                  |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_zh_CN.properties                               |    2 
 opendj-sdk/opendj3-server-dev/src/main/docbkx/admin-guide/appendix-l10n.xml                               |   18 +-
 opendj-sdk/opendj3-server-dev/src/messages/messages/log_zh_CN.properties                                  |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/config_zh_TW.properties                               |    4 
 opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_fr.properties                                |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/replication_es.properties                             |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/log_ja.properties                                     |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_zh_TW.properties                           |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/schema_ja.properties                                  |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/replication_de.properties                             |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig.properties                                   |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/core_zh_TW.properties                                 |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_zh_TW.properties                               |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/extension_zh_CN.properties                            |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/schema_ko.properties                                  |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/extension_fr.properties                               |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/utility_ko.properties                                 |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_pl.properties                              |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/admin_zh_TW.properties                                |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/log_ko.properties                                     |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/extension_de.properties                               |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_es.properties                                |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/extension_es.properties                               |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_fr.properties                                     |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_ko.properties                                |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_de.properties                                     |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/admin_zh_CN.properties                                |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/backend_ko.properties                                 |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/replication_ja.properties                             |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/extension_zh_TW.properties                            |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/replication_zh_CN.properties                          |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/utility_ja.properties                                 |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/schema_es.properties                                  |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/replication_fr.properties                             |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/schema_fr.properties                                  |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_ja.properties                                |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/replication.properties                                |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_es.properties                                     |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/utility_fr.properties                                 |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/version.properties                                    |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/extension_ca_ES.properties                            |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_es.properties                                |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/admin_ja.properties                                   |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_zh_TW.properties                             |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/replication_ko.properties                             |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_fr.properties                     |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_zh_TW.properties                  |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_ko.properties                     |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_ko.properties                          |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/utility_es.properties                                 |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_fr.properties                          |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/core_ja.properties                                    |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_de.properties                                  |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_ko.properties                                     |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_zh_CN.properties                  |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/schema.properties                                     |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/log_de.properties                                     |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/replication_zh_TW.properties                          |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_es.properties                              |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/utility_zh_CN.properties                              |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_zh_TW.properties                                  |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/extension_pl.properties                               |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/version_ko.properties                                 |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_de.properties                              |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/backend_ja.properties                                 |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_zh_CN.properties                       |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_zh_CN.properties                                  |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/config_ja.properties                                  |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/plugin.properties                                     |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/task_de.properties                                    |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/task_fr.properties                                    |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_zh_TW.properties                             |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_ja.properties                              |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/core_zh_CN.properties                                 |    2 
 opendj-sdk/opendj3-server-dev/tests/staf-tests/functional-tests/testcases/snmp/basic/snmp_basic_tests.xml |  144 ++++++++--------
 opendj-sdk/opendj3-server-dev/src/messages/messages/backend_zh_CN.properties                              |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_zh_CN.properties                             |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_ja.properties                                  |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/utility_zh_TW.properties                              |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/config_zh_CN.properties                               |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/log_fr.properties                                     |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/log_zh_TW.properties                                  |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/backend_es.properties                                 |    2 
 opendj-sdk/opendj3-server-dev/tests/functional_manual/setup/upgrade_revert_replicated_topology.html       |   11 
 opendj-sdk/opendj3-server-dev/src/messages/messages/version_fr.properties                                 |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_ko.properties                              |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/config_es.properties                                  |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_zh_CN.properties                             |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/tools_ko.properties                                   |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/extension_ko.properties                               |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_ja.properties                              |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/tools.properties                                      |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/admin_es.properties                                   |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_ja.properties                                |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/task_zh_TW.properties                                 |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/admin_de.properties                                   |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_zh_CN.properties                           |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/backend_de.properties                                 |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_de.properties                     |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_ko.properties                                |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_es.properties                     |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_de.properties                          |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_fr.properties                                |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/core_de.properties                                    |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/tools_ja.properties                                   |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_ca_ES.properties                           |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/task_ko.properties                                    |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_zh_TW.properties                       |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_fr.properties                              |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup.properties                                 |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_ko.properties                                  |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_es.properties                          |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/backend.properties                                    |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/tools_fr.properties                                   |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/version_de.properties                                 |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/protocol.properties                                   |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/tools_zh_TW.properties                                |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/tools_zh_CN.properties                                |    2 
 opendj-sdk/opendj3-server-dev/resource/admin/example-plugin/example_plugin_fr.properties                  |    4 
 opendj-sdk/opendj3-server-dev/src/messages/messages/config_ko.properties                                  |    4 
 opendj-sdk/opendj3-server-dev/src/messages/messages/task_zh_CN.properties                                 |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/schema_zh_TW.properties                               |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/backend_zh_TW.properties                              |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_ja.properties                     |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/tools_de.properties                                   |    2 
 opendj-sdk/opendj3-server-dev/src/messages/messages/admin.properties                                      |    2 
 168 files changed, 256 insertions(+), 255 deletions(-)

diff --git a/opendj-sdk/opendj3-server-dev/resource/admin/example-plugin/example_plugin.properties b/opendj-sdk/opendj3-server-dev/resource/admin/example-plugin/example_plugin.properties
index 818aa9e..6e0f028 100644
--- a/opendj-sdk/opendj3-server-dev/resource/admin/example-plugin/example_plugin.properties
+++ b/opendj-sdk/opendj3-server-dev/resource/admin/example-plugin/example_plugin.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
@@ -46,7 +46,7 @@
 #
 # ORDINAL is an integer unique among other ordinals in this file
 #
-SEVERE_ERR_INITIALIZE_PLUGIN_1="Invalid plugin type %s for the example plugin.
+ERR_INITIALIZE_PLUGIN_1="Invalid plugin type %s for the example plugin.
 NOTE_DO_STARTUP_2=Example plugin message '%s'.
 NOTE_APPLY_CONFIGURATION_CHANGE_3="Example plugin message has been changed \
 from '%s' to '%s'.
diff --git a/opendj-sdk/opendj3-server-dev/resource/admin/example-plugin/example_plugin_fr.properties b/opendj-sdk/opendj3-server-dev/resource/admin/example-plugin/example_plugin_fr.properties
index 4b5f73f..6417459 100644
--- a/opendj-sdk/opendj3-server-dev/resource/admin/example-plugin/example_plugin_fr.properties
+++ b/opendj-sdk/opendj3-server-dev/resource/admin/example-plugin/example_plugin_fr.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
@@ -46,7 +46,7 @@
 #
 # ORDINAL is an integer unique among other ordinals in this file
 #
-SEVERE_ERR_INITIALIZE_PLUGIN_1="Type de plugin invalide %s pour le plugin d'exemple.
+ERR_INITIALIZE_PLUGIN_1="Type de plugin invalide %s pour le plugin d'exemple.
 NOTE_DO_STARTUP_2=Message du plugin d'exemple '%s'.
 NOTE_APPLY_CONFIGURATION_CHANGE_3="Le message du plugin d'exemple a été modifié \
 de '%s' en '%s'.
diff --git a/opendj-sdk/opendj3-server-dev/src/main/docbkx/admin-guide/appendix-l10n.xml b/opendj-sdk/opendj3-server-dev/src/main/docbkx/admin-guide/appendix-l10n.xml
index 68350f5..28345f2 100644
--- a/opendj-sdk/opendj3-server-dev/src/main/docbkx/admin-guide/appendix-l10n.xml
+++ b/opendj-sdk/opendj3-server-dev/src/main/docbkx/admin-guide/appendix-l10n.xml
@@ -20,8 +20,8 @@
   !
   ! CCPL HEADER END
   !
-  !      Copyright 2011 ForgeRock AS
-  !    
+  !      Copyright 2011-2014 ForgeRock AS
+  !
 -->
 <appendix xml:id='appendix-l10n'
  xmlns='http://docbook.org/ns/docbook' version='5.0' xml:lang='en'
@@ -35,13 +35,13 @@
  and to search for attribute values according to a variety of language
  specific locales. OpenDJ software is also itself localized for a smaller
  variety of languages.</para>
- 
+
  <section xml:id="supported-languages">
   <title>OpenDJ Languages</title>
   <indexterm><primary>Languages</primary></indexterm>
   <para>OpenDJ <?eval ${docTargetVersion}?> software has been localized
   in the following languages.</para>
-  
+
   <itemizedlist>
     <listitem><para>French</para></listitem>
     <listitem><para>German</para></listitem>
@@ -49,14 +49,14 @@
     <listitem><para>Simplified Chinese</para></listitem>
     <listitem><para>Spanish</para></listitem>
   </itemizedlist>
-   
+
   <note>
    <para>Certain messages have also been translated into Catalan, Korean,
    Polish, and Traditional Chinese. Some error messages including messages
-   labeled SEVERE and FATAL are provided only in English.</para>
+   labeled ERROR are provided only in English.</para>
   </note>
  </section>
- 
+
  <section xml:id="supported-locales">
   <title>Directory Support For Locales and Language Subtypes</title>
   <indexterm><primary>Locales</primary></indexterm>
@@ -64,7 +64,7 @@
   associated language and country codes, and their collation order
   object identifiers. Locale support depends on the underlying Java
   Virtual Machine.</para>
-  
+
   <variablelist>
    <varlistentry>
     <term>Albanian</term>
@@ -795,7 +795,7 @@
     </listitem>
    </varlistentry>
   </variablelist>
-  
+
   <para>OpenDJ software supports the following language subtypes.</para>
   <indexterm><primary>Language subtypes</primary></indexterm>
   <itemizedlist xml:id="supported-language-subtypes">
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_de.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_de.properties
index 526d174..298b2b7 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_de.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_de.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_es.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_es.properties
index c152d52..e03a728 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_es.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_es.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_fr.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_fr.properties
index cf241d2..37c459a 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_fr.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_fr.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_ja.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_ja.properties
index e46cc7d..478c314 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_ja.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_ja.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_ko.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_ko.properties
index d6826ee..cc4ccac 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_ko.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_ko.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_zh_CN.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_zh_CN.properties
index 9e52004..8fc6fe7 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_zh_CN.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_zh_CN.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_zh_TW.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_zh_TW.properties
index e74ebbe..b733944 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_zh_TW.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_zh_TW.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/admin.properties
index b29f2cc..5b04bf8 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/admin.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_de.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_de.properties
index 1418d39..82dadde 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_de.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_de.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_es.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_es.properties
index 80408a6..7be6ed0 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_es.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_es.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_fr.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_fr.properties
index fcc7425..f9127a8 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_fr.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_fr.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_ja.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_ja.properties
index f345970..839bdee 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_ja.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_ja.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_ko.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_ko.properties
index f97200b..fae57b2 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_ko.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_ko.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool.properties
index 0599575..2281448 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool.properties
@@ -42,7 +42,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_de.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_de.properties
index 88cd10f..e92f139 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_de.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_de.properties
@@ -41,7 +41,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_es.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_es.properties
index 25925c4..bbf5775 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_es.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_es.properties
@@ -41,7 +41,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_fr.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_fr.properties
index 7142130..4b7eede 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_fr.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_fr.properties
@@ -41,7 +41,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_ja.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_ja.properties
index 2b0257d..12608e4 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_ja.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_ja.properties
@@ -41,7 +41,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_ko.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_ko.properties
index 28c490d..7b82f0f 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_ko.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_ko.properties
@@ -41,7 +41,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_pl.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_pl.properties
index e0a7d3c..7398305 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_pl.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_pl.properties
@@ -41,7 +41,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_zh_CN.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_zh_CN.properties
index 18262ae..feb5792 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_zh_CN.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_zh_CN.properties
@@ -41,7 +41,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_zh_TW.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_zh_TW.properties
index a074180..d518a04 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_zh_TW.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_zh_TW.properties
@@ -41,7 +41,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_zh_CN.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_zh_CN.properties
index 4cc4261..56de54c 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_zh_CN.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_zh_CN.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_zh_TW.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_zh_TW.properties
index 6e43061..ae87ded 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_zh_TW.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_zh_TW.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/backend.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/backend.properties
index 70dc6e0..84924f2 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/backend.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/backend.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_de.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_de.properties
index d3a26c6..96304e8 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_de.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_de.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_es.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_es.properties
index 5cc0b07..b62ec08 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_es.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_es.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_fr.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_fr.properties
index b7573c1..adb0684 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_fr.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_fr.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_ja.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_ja.properties
index e7e40cf..336411d 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_ja.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_ja.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_ko.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_ko.properties
index 5bb7ed4..b9b56a2 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_ko.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_ko.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_zh_CN.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_zh_CN.properties
index ddb1d0d..dc4b332 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_zh_CN.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_zh_CN.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_zh_TW.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_zh_TW.properties
index e23cb13..fb02adb 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_zh_TW.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_zh_TW.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/config.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/config.properties
index 96d3170..a22ba53 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/config.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/config.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/config_de.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/config_de.properties
index 2ba1a8d..8598599 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/config_de.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/config_de.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/config_es.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/config_es.properties
index 7789368..55e31f2 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/config_es.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/config_es.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/config_fr.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/config_fr.properties
index 08aeaf1..3532849 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/config_fr.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/config_fr.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/config_ja.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/config_ja.properties
index 581713a..7deeaed 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/config_ja.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/config_ja.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/config_ko.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/config_ko.properties
index 490fab0..2cbb913 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/config_ko.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/config_ko.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
@@ -136,7 +136,7 @@
 WARN_CONFIG_SCHEMA_SYNTAX_CONFLICTING_SYNTAX_187=\uad6c\uc131 \ud56d\ubaa9 %s\uc5d0 \uc815\uc758\ub41c \uc18d\uc131 \uad6c\ubb38\uc774 \uc11c\ubc84 \uad6c\uc131\uc5d0 \uc815\uc758\ub41c \ub2e4\ub978 \uad6c\ubb38\uacfc \ucda9\ub3cc\ud569\ub2c8\ub2e4: %s. \uc774 \uc18d\uc131 \uad6c\ubb38\uc774 \uc0ac\uc6a9\ub418\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
 ERR_CONFIG_SCHEMA_NO_SCHEMA_DIR_188=\uc2a4\ud0a4\ub9c8 \ub514\ub809\ud1a0\ub9ac %s\uc774(\uac00) \uc5c6\uae30 \ub54c\ubb38\uc5d0 \ub514\ub809\ud1a0\ub9ac \uc11c\ubc84 \uc2a4\ud0a4\ub9c8 \uc815\uc758\ub97c \uc77d\uc744 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
 ERR_CONFIG_SCHEMA_DIR_NOT_DIRECTORY_189=\uc2a4\ud0a4\ub9c8 \ub514\ub809\ud1a0\ub9ac %s\uc774(\uac00) \uc788\uc9c0\ub9cc \ub514\ub809\ud1a0\ub9ac\uac00 \uc544\ub2c8\ubbc0\ub85c \ub514\ub809\ud1a0\ub9ac \uc11c\ubc84 \uc2a4\ud0a4\ub9c8 \uc815\uc758\ub97c \uc77d\uc744 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
-#SEVERE_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
+#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
 WARN_CONFIG_SCHEMA_CANNOT_OPEN_FILE_191=\uc77d\uc744 \ud30c\uc77c\uc744 \uc5ec\ub294 \ub3d9\uc548 \uc608\uae30\uce58 \uc54a\uc740 \uc624\ub958\uac00 \ubc1c\uc0dd\ud558\uc5ec \ub514\ub809\ud1a0\ub9ac %2$s\uc758 \uc2a4\ud0a4\ub9c8 \uad6c\uc131 \ud30c\uc77c %1$s\uc744(\ub97c) \uad6c\ubb38 \ubd84\uc11d\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4: %3$s
 WARN_CONFIG_SCHEMA_CANNOT_READ_LDIF_ENTRY_192=\ub514\ub809\ud1a0\ub9ac %2$s\uc758 \uc2a4\ud0a4\ub9c8 \uad6c\uc131 \ud30c\uc77c %1$s\uc758 \ub0b4\uc6a9\uc744 LDIF \ud56d\ubaa9\uc73c\ub85c \uc77d\ub294 \ub3d9\uc548 \uc608\uae30\uce58 \uc54a\uc740 \uc624\ub958\uac00 \ubc1c\uc0dd\ud558\uc5ec \uc774 \ud30c\uc77c\uc744 \uad6c\ubb38 \ubd84\uc11d\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4: %3$s
 WARN_CONFIG_SCHEMA_CANNOT_PARSE_ATTR_TYPE_193=\uc2a4\ud0a4\ub9c8 \uad6c\uc131 \ud30c\uc77c %s\uc5d0\uc11c \uc18d\uc131 \uc720\ud615 \uc815\uc758\ub97c \uad6c\ubb38 \ubd84\uc11d\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4: %s
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/config_zh_CN.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/config_zh_CN.properties
index 7b4f82b..84b779e 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/config_zh_CN.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/config_zh_CN.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/config_zh_TW.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/config_zh_TW.properties
index d99fb4a..b854f67 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/config_zh_TW.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/config_zh_TW.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
@@ -136,7 +136,7 @@
 WARN_CONFIG_SCHEMA_SYNTAX_CONFLICTING_SYNTAX_187=\u914d\u7f6e\u9805\u76ee %s \u4e2d\u5b9a\u7fa9\u7684\u5c6c\u6027\u8a9e\u6cd5\uff0c\u8207\u4f3a\u670d\u5668\u914d\u7f6e\u4e2d\u5b9a\u7fa9\u7684\u53e6\u4e00\u500b\u8a9e\u6cd5\u885d\u7a81: %s\u3002\u5c07\u4e0d\u6703\u4f7f\u7528\u6b64\u5c6c\u6027\u8a9e\u6cd5
 ERR_CONFIG_SCHEMA_NO_SCHEMA_DIR_188=\u7121\u6cd5\u8b80\u53d6\u76ee\u9304\u4f3a\u670d\u5668\u6a21\u5f0f\u5b9a\u7fa9\uff0c\u56e0\u70ba\u6a21\u5f0f\u76ee\u9304 %s \u4e0d\u5b58\u5728
 ERR_CONFIG_SCHEMA_DIR_NOT_DIRECTORY_189=\u7121\u6cd5\u8b80\u53d6\u76ee\u9304\u4f3a\u670d\u5668\u6a21\u5f0f\u5b9a\u7fa9\uff0c\u56e0\u70ba\u6a21\u5f0f\u76ee\u9304 %s \u5b58\u5728\u4f46\u4e0d\u662f\u76ee\u9304
-#SEVERE_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
+#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
 WARN_CONFIG_SCHEMA_CANNOT_OPEN_FILE_191=\u7121\u6cd5\u5256\u6790\u6a21\u5f0f\u914d\u7f6e\u6a94\u6848 %s (\u4f4d\u65bc\u76ee\u9304 %s \u4e2d)\uff0c\u56e0\u70ba\u5617\u8a66\u958b\u555f\u6a94\u6848\u4ee5\u8b80\u53d6\u6642\u767c\u751f\u672a\u9810\u671f\u7684\u932f\u8aa4: %s
 WARN_CONFIG_SCHEMA_CANNOT_READ_LDIF_ENTRY_192=\u7121\u6cd5\u5256\u6790\u6a21\u5f0f\u914d\u7f6e\u6a94\u6848 %s (\u4f4d\u65bc\u76ee\u9304 %s \u4e2d)\uff0c\u56e0\u70ba\u5617\u8a66\u5c07\u5b83\u7684\u5167\u5bb9\u8b80\u53d6\u70ba LDIF \u9805\u76ee\u6642\u767c\u751f\u672a\u9810\u671f\u7684\u932f\u8aa4: %s
 WARN_CONFIG_SCHEMA_CANNOT_PARSE_ATTR_TYPE_193=\u7121\u6cd5\u5256\u6790\u6a21\u5f0f\u914d\u7f6e\u6a94\u6848 %s \u4e2d\u7684\u5c6c\u6027\u985e\u578b\u5b9a\u7fa9: %s
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/core.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/core.properties
index 900dae9..e71e374 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/core.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/core.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/core_de.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/core_de.properties
index c3d6a50..9688d0c 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/core_de.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/core_de.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/core_es.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/core_es.properties
index b98c070..3d0ec12 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/core_es.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/core_es.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/core_fr.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/core_fr.properties
index 0f7c5df..fbdf294 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/core_fr.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/core_fr.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/core_ja.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/core_ja.properties
index c55c8eb..0505ecc 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/core_ja.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/core_ja.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/core_ko.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/core_ko.properties
index 591b64e..b75ba73 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/core_ko.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/core_ko.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/core_zh_CN.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/core_zh_CN.properties
index c60dbb0..6cbb463 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/core_zh_CN.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/core_zh_CN.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/core_zh_TW.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/core_zh_TW.properties
index baa0342..d5239d2 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/core_zh_TW.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/core_zh_TW.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig.properties
index 55d188d..808b2c3 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_de.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_de.properties
index 2567ede..a8369d4 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_de.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_de.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_es.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_es.properties
index 9b2fbab..0e2b7c3 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_es.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_es.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_fr.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_fr.properties
index 95e84b2..d76e5ba 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_fr.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_fr.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_ja.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_ja.properties
index e3f5f3e7..65bcfd0 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_ja.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_ja.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_ko.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_ko.properties
index f3510ff..27912d0 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_ko.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_ko.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_zh_CN.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_zh_CN.properties
index a630e4c..ec92374 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_zh_CN.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_zh_CN.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_zh_TW.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_zh_TW.properties
index ca60555..dd1b65d 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_zh_TW.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_zh_TW.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/extension.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/extension.properties
index fa8592e..4582f98 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/extension.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/extension.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_ca_ES.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_ca_ES.properties
index 76d9fc5..e89afed 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_ca_ES.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_ca_ES.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_de.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_de.properties
index bf56ac6..a913f8f 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_de.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_de.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_es.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_es.properties
index 1dc317a..51cda09 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_es.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_es.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_fr.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_fr.properties
index 21aa3dc..15f3305 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_fr.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_fr.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_ja.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_ja.properties
index 65a9cfb..1a97528 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_ja.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_ja.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_ko.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_ko.properties
index 435d236..2b0d032 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_ko.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_ko.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_pl.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_pl.properties
index b828560..e88e141 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_pl.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_pl.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_zh_CN.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_zh_CN.properties
index 8bfb89b..6d285c0 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_zh_CN.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_zh_CN.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_zh_TW.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_zh_TW.properties
index 330f060..32159d3 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_zh_TW.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_zh_TW.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb.properties
index ff7342f..65e2490 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_de.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_de.properties
index e6505d5..df600a7 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_de.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_de.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_es.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_es.properties
index a7ab234..7c50487 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_es.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_es.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_fr.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_fr.properties
index 3ab5774..9ed8c92 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_fr.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_fr.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_ja.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_ja.properties
index 3f55c11..ae5d6fa 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_ja.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_ja.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_ko.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_ko.properties
index a260fe4..de45726 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_ko.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_ko.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_zh_CN.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_zh_CN.properties
index 95b10e6..04e517d 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_zh_CN.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_zh_CN.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_zh_TW.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_zh_TW.properties
index 4914366..1cb4a67 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_zh_TW.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_zh_TW.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/log.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/log.properties
index 1783e5d..b45178a 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/log.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/log.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/log_de.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/log_de.properties
index 454e028..12e1c85 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/log_de.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/log_de.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/log_es.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/log_es.properties
index 7c5bc23..5d1258e 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/log_es.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/log_es.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/log_fr.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/log_fr.properties
index 8e75a00..e7c3c67 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/log_fr.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/log_fr.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/log_ja.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/log_ja.properties
index f6b2c5b..ea11a9c 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/log_ja.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/log_ja.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/log_ko.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/log_ko.properties
index 715e9c0..b3c6671 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/log_ko.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/log_ko.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/log_zh_CN.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/log_zh_CN.properties
index 599a00f..b695565 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/log_zh_CN.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/log_zh_CN.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/log_zh_TW.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/log_zh_TW.properties
index 45b9bc1..b4eb5e5 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/log_zh_TW.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/log_zh_TW.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin.properties
index b0561ee..8a091d2 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_de.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_de.properties
index 83c749d..acd494e 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_de.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_de.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_es.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_es.properties
index 117b8b2..a5501ed 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_es.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_es.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_fr.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_fr.properties
index acc0cf4..56bdcf7 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_fr.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_fr.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_ja.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_ja.properties
index 6650af7..7ba7b99 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_ja.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_ja.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_ko.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_ko.properties
index 071277d..276ea1b 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_ko.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_ko.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_zh_CN.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_zh_CN.properties
index 61ce9c7..74d7aa4 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_zh_CN.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_zh_CN.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_zh_TW.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_zh_TW.properties
index 44526df..7dd0b75 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_zh_TW.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_zh_TW.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol.properties
index 266a18d..1aeb9f3 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol.properties
@@ -40,7 +40,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_de.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_de.properties
index 1533175..d2d02d5 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_de.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_de.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_es.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_es.properties
index b12ce4d..a263be4 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_es.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_es.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_fr.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_fr.properties
index ea8ecb5..d22f1da 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_fr.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_fr.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_ja.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_ja.properties
index dc9b85c..9f9d81e 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_ja.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_ja.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_ko.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_ko.properties
index f17d54c..fcc6eb1 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_ko.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_ko.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_zh_CN.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_zh_CN.properties
index 1bbf8ed..65bcc12 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_zh_CN.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_zh_CN.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_zh_TW.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_zh_TW.properties
index 84cdd79..b77e027 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_zh_TW.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_zh_TW.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup.properties
index a8e8150..806240e 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup.properties
@@ -42,7 +42,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_ca_ES.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_ca_ES.properties
index 64f0fb1..aad7f6c 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_ca_ES.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_ca_ES.properties
@@ -42,7 +42,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_de.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_de.properties
index 37185db..201016b 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_de.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_de.properties
@@ -42,7 +42,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_es.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_es.properties
index 3fae48a..37fe2d1 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_es.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_es.properties
@@ -42,7 +42,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_fr.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_fr.properties
index 680bc6c..a48bf98 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_fr.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_fr.properties
@@ -42,7 +42,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_ja.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_ja.properties
index c9f4378..088117d 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_ja.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_ja.properties
@@ -42,7 +42,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_ko.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_ko.properties
index 777380a..8128527 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_ko.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_ko.properties
@@ -42,7 +42,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_zh_CN.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_zh_CN.properties
index b75f661..1f82755 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_zh_CN.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_zh_CN.properties
@@ -42,7 +42,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_zh_TW.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_zh_TW.properties
index 6ec9db8..d5ad8f9 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_zh_TW.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_zh_TW.properties
@@ -43,7 +43,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/replication.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/replication.properties
index 1e81de3..4d6c52b 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/replication.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/replication.properties
@@ -44,7 +44,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/replication_de.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/replication_de.properties
index 4e3780f..b5a841c 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/replication_de.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/replication_de.properties
@@ -44,7 +44,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/replication_es.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/replication_es.properties
index d12178f..224bc6a 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/replication_es.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/replication_es.properties
@@ -44,7 +44,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/replication_fr.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/replication_fr.properties
index 83252b5..48b3ad3 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/replication_fr.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/replication_fr.properties
@@ -44,7 +44,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/replication_ja.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/replication_ja.properties
index 5dc8149..132f720 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/replication_ja.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/replication_ja.properties
@@ -44,7 +44,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/replication_ko.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/replication_ko.properties
index 4f6d405..f38997a 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/replication_ko.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/replication_ko.properties
@@ -44,7 +44,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/replication_zh_CN.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/replication_zh_CN.properties
index 83db807..a236e9c 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/replication_zh_CN.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/replication_zh_CN.properties
@@ -44,7 +44,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/replication_zh_TW.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/replication_zh_TW.properties
index f0bcb1d..463c777 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/replication_zh_TW.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/replication_zh_TW.properties
@@ -44,7 +44,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information.properties
index 3b72e32..20bf144 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_de.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_de.properties
index e8ee7d2..b7b8885 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_de.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_de.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_es.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_es.properties
index edc72ef..0cb8a5b 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_es.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_es.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_fr.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_fr.properties
index 7769b31..16fb1db 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_fr.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_fr.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_ja.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_ja.properties
index 569576f..81bd8c3 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_ja.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_ja.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_ko.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_ko.properties
index 5c6f516..4ca2cbd 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_ko.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_ko.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_zh_CN.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_zh_CN.properties
index e491be8..1981e76 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_zh_CN.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_zh_CN.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_zh_TW.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_zh_TW.properties
index e6da7b5..8d085b6 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_zh_TW.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_zh_TW.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/schema.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/schema.properties
index c9df47d..cad39ec 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/schema.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/schema.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/schema_de.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/schema_de.properties
index 9485876..9358374 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/schema_de.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/schema_de.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/schema_es.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/schema_es.properties
index 6ee599d..0be38da 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/schema_es.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/schema_es.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/schema_fr.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/schema_fr.properties
index dbdc6a2..c6da0d8 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/schema_fr.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/schema_fr.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/schema_ja.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/schema_ja.properties
index 37c4675..a80eb85 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/schema_ja.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/schema_ja.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/schema_ko.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/schema_ko.properties
index 85d2f16..b2cd5e2 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/schema_ko.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/schema_ko.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/schema_zh_CN.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/schema_zh_CN.properties
index 13af639..6a40eb0 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/schema_zh_CN.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/schema_zh_CN.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/schema_zh_TW.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/schema_zh_TW.properties
index 574b0de..843c99f 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/schema_zh_TW.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/schema_zh_TW.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/task.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/task.properties
index a6903f7..6256a8c 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/task.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/task.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/task_de.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/task_de.properties
index f7b8a31..0884baf 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/task_de.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/task_de.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/task_es.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/task_es.properties
index 1dba16d..4db1fe8 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/task_es.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/task_es.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/task_fr.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/task_fr.properties
index d08fe71..d4d15a9 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/task_fr.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/task_fr.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/task_ja.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/task_ja.properties
index 54652b2..e9479ce 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/task_ja.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/task_ja.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/task_ko.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/task_ko.properties
index e640b76..dfb97a9 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/task_ko.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/task_ko.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/task_zh_CN.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/task_zh_CN.properties
index d1ef0f3..02887e5 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/task_zh_CN.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/task_zh_CN.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/task_zh_TW.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/task_zh_TW.properties
index 2dfcf7f..7175c99 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/task_zh_TW.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/task_zh_TW.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/tools.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/tools.properties
index 29128ad..9960fe4 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/tools.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/tools.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_de.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_de.properties
index bb1cad2..20174a4 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_de.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_de.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_es.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_es.properties
index 3e0bfbf..9eb6d8e 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_es.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_es.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_fr.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_fr.properties
index ea02bdc..3aff158 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_fr.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_fr.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_ja.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_ja.properties
index 7e9de26..ccbed5a 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_ja.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_ja.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_ko.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_ko.properties
index 5c3d487..9f3504f 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_ko.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_ko.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_zh_CN.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_zh_CN.properties
index 893b67d..23f7264 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_zh_CN.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_zh_CN.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_zh_TW.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_zh_TW.properties
index 380d26a..44636b1 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_zh_TW.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_zh_TW.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/utility.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/utility.properties
index ea48d45..b0098b4 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/utility.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/utility.properties
@@ -40,7 +40,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_de.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_de.properties
index bdfb5ea..c4d1dcb 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_de.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_de.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_es.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_es.properties
index ea6020a..baa4418 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_es.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_es.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_fr.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_fr.properties
index 375fe42..323d379 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_fr.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_fr.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_ja.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_ja.properties
index 39123d1..5c91575 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_ja.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_ja.properties
@@ -40,7 +40,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_ko.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_ko.properties
index be4624f..1bd5a1d 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_ko.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_ko.properties
@@ -40,7 +40,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_zh_CN.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_zh_CN.properties
index f78964e..094933d 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_zh_CN.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_zh_CN.properties
@@ -40,7 +40,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_zh_TW.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_zh_TW.properties
index a81ca25..5605a95 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_zh_TW.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_zh_TW.properties
@@ -40,7 +40,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/version.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/version.properties
index 145708f..6ab5395 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/version.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/version.properties
@@ -39,7 +39,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/version_de.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/version_de.properties
index 721192a..4a73ee8 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/version_de.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/version_de.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/version_es.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/version_es.properties
index c86b2c8..cdcb0f8 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/version_es.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/version_es.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/version_fr.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/version_fr.properties
index c739efd..ee93013 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/version_fr.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/version_fr.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/version_ja.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/version_ja.properties
index fb65968..be50475 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/version_ja.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/version_ja.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/version_ko.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/version_ko.properties
index 72808fd..d03b19b 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/version_ko.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/version_ko.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/version_zh_CN.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/version_zh_CN.properties
index 737d74f..e869f9c 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/version_zh_CN.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/version_zh_CN.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/version_zh_TW.properties b/opendj-sdk/opendj3-server-dev/src/messages/messages/version_zh_TW.properties
index 34ccf98..e0e823f 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/version_zh_TW.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/messages/version_zh_TW.properties
@@ -38,7 +38,7 @@
 # where:
 #
 # SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [ERR, WARN, NOTICE, INFO, DEBUG]
 #
 # DESCRIPTION is an upper case string providing a hint as to the context of
 # the message in upper case with the underscore ('_') character serving as
diff --git a/opendj-sdk/opendj3-server-dev/tests/functional_manual/setup/upgrade_revert_replicated_topology.html b/opendj-sdk/opendj3-server-dev/tests/functional_manual/setup/upgrade_revert_replicated_topology.html
index a60ac33..419fe99 100644
--- a/opendj-sdk/opendj3-server-dev/tests/functional_manual/setup/upgrade_revert_replicated_topology.html
+++ b/opendj-sdk/opendj3-server-dev/tests/functional_manual/setup/upgrade_revert_replicated_topology.html
@@ -22,6 +22,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2008 Sun Microsystems, Inc.
+ !      Portions Copyright 2014 ForgeRock AS
  ! -->
 <HTML>
 <title>upgrade_revert_replicated_topology</title>
@@ -262,17 +263,17 @@
 			completed successfully</SPAN><B><BR><BR><BR>$ grep ERROR
 			/var/tmp/opends-upgrade-57522.log<BR></B><SPAN STYLE="font-weight: medium">INFO:
 			server: [28/Jan/2008:16:52:46 +0100] category=SYNC
-			severity=SEVERE_ERROR msgID=14942294 msg=Replication server caught
+			severity=ERROR msgID=14942294 msg=Replication server caught
 			exception while listening for client connections Socket
 			closed<BR>INFO: server: [28/Jan/2008:16:52:46 +0100] category=SYNC
-			severity=SEVERE_ERROR msgID=-1 msg=Error during the changelog
+			severity=ERROR msgID=-1 msg=Error during the changelog
 			database trimming or flush process. The Changelog service is going
 			to shutdown(JE 3.2.70) Can't open a cursor Database state can't be
 			DbState.CLOSED must be DbState.OPEN (Database.java:1079
 			Database.java:369 ReplicationDB.java:365 ReplicationDB.java:315
 			ReplicationDB.java:206 DbHandler.java:408 DbHandler.java:358
 			Thread.java:619)<BR>INFO: server: [28/Jan/2008:16:52:46 +0100]
-			category=SYNC severity=SEVERE_ERROR msgID=-1 msg=Error closing the
+			category=SYNC severity=ERROR msgID=-1 msg=Error closing the
 			changelog database :(JE 3.2.70) There is 1 open Database in the
 			Environment.<BR><BR><BR></SPAN><B><BR>$ start-ds -F<BR></B><SPAN STYLE="font-weight: medium">OpenDS
 			Directory Server 1.0.0<BR>Build ID:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -422,7 +423,7 @@
 			completed successfully<BR><BR></SPAN><B><BR>$ grep ERROR
 			/var/tmp/opends-upgrade-28222.log<BR></B><SPAN STYLE="font-weight: medium">INFO:
 			server: [28/Jan/2008:17:14:14 +0100] category=SYNC
-			severity=SEVERE_ERROR msgID=14942294 msg=Replication server caught
+			severity=ERROR msgID=14942294 msg=Replication server caught
 			exception while listening for client connections Socket
 			closed</SPAN><B><BR><BR><BR><BR>$ start-ds -F<BR></B><SPAN STYLE="font-weight: medium">OpenDS
 			Directory Server 1.0.0<BR>Build ID:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -617,7 +618,7 @@
 			completed successfully<BR></SPAN><B><BR>$ grep ERROR
 			/var/tmp/opends-upgrade-58428.log<BR></B><SPAN STYLE="font-weight: medium">INFO:
 			server: [28/Jan/2008:18:02:58 +0100] category=SYNC
-			severity=SEVERE_ERROR msgID=14942294 msg=Replication server caught
+			severity=ERROR msgID=14942294 msg=Replication server caught
 			exception while listening for client connections Socket closed<BR><BR></SPAN><B><BR>$
 			start-ds -F<BR></B><SPAN STYLE="font-weight: medium">OpenDS
 			Directory Server 1.0.0<BR>Build ID:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
diff --git a/opendj-sdk/opendj3-server-dev/tests/staf-tests/functional-tests/testcases/snmp/basic/snmp_basic_tests.xml b/opendj-sdk/opendj3-server-dev/tests/staf-tests/functional-tests/testcases/snmp/basic/snmp_basic_tests.xml
index a54bd43..c4a5ae5 100644
--- a/opendj-sdk/opendj3-server-dev/tests/staf-tests/functional-tests/testcases/snmp/basic/snmp_basic_tests.xml
+++ b/opendj-sdk/opendj3-server-dev/tests/staf-tests/functional-tests/testcases/snmp/basic/snmp_basic_tests.xml
@@ -23,7 +23,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2008 Sun Microsystems, Inc.
- !      Portions Copyright 2012-2013 ForgeRock AS
+ !      Portions Copyright 2012-2014 ForgeRock AS
  ! -->
 <stax>
 
@@ -38,10 +38,10 @@
     #@TestResult          TODO.
   -->
   <function name="snmp_basic_001" scope="local">
-    <testcase name="getTestCaseName('SNMP Default Properties')">                     
-      <sequence> 
+    <testcase name="getTestCaseName('SNMP Default Properties')">
+      <sequence>
         <try>
-          <sequence>                
+          <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
                'Test Name = %s' % STAXCurrentTestcase
@@ -55,20 +55,20 @@
               result = compare_property_table(EXPECTED_PROPERTIES,
                                               DEFAULT_PROPERTIES)
             </script>
-            
+
             <message>
               '%s' % result
-            </message>              
-              
+            </message>
+
             <call function="'checktestStringNotPresent'">
               {
               'returnString' : result ,
               'testString'   : 'ERROR'
               }
             </call>
-              
+
           </sequence>
-  
+
           <catch exception="'STAXException'" typevar="eType" var="eInfo">
             <message log="1" level="'fatal'">
               '%s: Test failed. eInfo(%s)' % (eType,eInfo)
@@ -95,8 +95,8 @@
     #@TestResult          TODO.
   -->
   <function name="snmp_basic_002" scope="local">
-    <testcase name="getTestCaseName('Check the connection handlers')">                     
-      <sequence> 
+    <testcase name="getTestCaseName('Check the connection handlers')">
+      <sequence>
         <try>
           <sequence>
 
@@ -169,7 +169,7 @@
             </if>
 
           </sequence>
-  
+
           <catch exception="'STAXException'" typevar="eType" var="eInfo">
             <message log="1" level="'fatal'">
               '%s: Test failed. eInfo(%s)' % (eType,eInfo)
@@ -196,8 +196,8 @@
     #@TestResult          TODO.
   -->
   <function name="snmp_basic_003" scope="local">
-    <testcase name="getTestCaseName('Check value of dsServerType entry')">                     
-      <sequence> 
+    <testcase name="getTestCaseName('Check value of dsServerType entry')">
+      <sequence>
         <try>
 
           <sequence>
@@ -246,7 +246,7 @@
               DEFAULT_VALUES = global_DEFAULT_VALUES.get()
               dsServerType = DEFAULT_VALUES['dsServerType.1']
             </script>
-            
+
             <if expr="dsServerType == dsServer">
               <sequence>
                 <script>
@@ -276,7 +276,7 @@
             </if>
 
           </sequence>
-  
+
           <catch exception="'STAXException'" typevar="eType" var="eInfo">
             <message log="1" level="'fatal'">
               '%s: Test failed. eInfo(%s)' % (eType,eInfo)
@@ -303,8 +303,8 @@
     #@TestResult          TODO.
   -->
   <function name="snmp_basic_004" scope="local">
-    <testcase name="getTestCaseName('Check value of dsServerDescription entry')">                     
-      <sequence> 
+    <testcase name="getTestCaseName('Check value of dsServerDescription entry')">
+      <sequence>
         <try>
 
           <sequence>
@@ -352,7 +352,7 @@
             </if>
 
           </sequence>
-  
+
           <catch exception="'STAXException'" typevar="eType" var="eInfo">
             <message log="1" level="'fatal'">
               '%s: Test failed. eInfo(%s)' % (eType,eInfo)
@@ -379,8 +379,8 @@
     #@TestResult          TODO.
   -->
   <function name="snmp_basic_005" scope="local">
-    <testcase name="getTestCaseName('Check value of dsApplIfSearchOps entry')">                     
-      <sequence> 
+    <testcase name="getTestCaseName('Check value of dsApplIfSearchOps entry')">
+      <sequence>
         <try>
 
           <sequence>
@@ -435,7 +435,7 @@
               DEFAULT_VALUES[key] = \
                 str(int(DEFAULT_VALUES[key]) + nbLoop)
             </script>
-              
+
             <call function="'testStep'">
               { 'stepMessage' : 'Check value of dsApplIfSearchOps entry' }
             </call>
@@ -469,11 +469,11 @@
               DEFAULT_VALUES = {}
               global_DEFAULT_VALUES.set({})
               DEFAULT_VALUES = create_table_fromoutput(STAXResult[0][1])
-              global_DEFAULT_VALUES.set(DEFAULT_VALUES)       
+              global_DEFAULT_VALUES.set(DEFAULT_VALUES)
             </script>
 
           </sequence>
-  
+
           <catch exception="'STAXException'" typevar="eType" var="eInfo">
             <message log="1" level="'fatal'">
               '%s: Test failed. eInfo(%s)' % (eType,eInfo)
@@ -500,8 +500,8 @@
     #@TestResult          TODO.
   -->
   <function name="snmp_basic_006" scope="local">
-    <testcase name="getTestCaseName('Check value of dsApplIfAddEntryOps entry')">                     
-      <sequence> 
+    <testcase name="getTestCaseName('Check value of dsApplIfAddEntryOps entry')">
+      <sequence>
         <try>
 
           <sequence>
@@ -564,7 +564,7 @@
               DEFAULT_VALUES['dsMasterEntries.1'] = \
                 str(int(DEFAULT_VALUES['dsMasterEntries.1']) + nbLoop)
             </script>
-            
+
             <call function="'testStep'">
               { 'stepMessage' : 'Check value of dsApplIfAddEntryOps entry' }
             </call>
@@ -602,7 +602,7 @@
             </script>
 
           </sequence>
-  
+
           <catch exception="'STAXException'" typevar="eType" var="eInfo">
             <message log="1" level="'fatal'">
               '%s: Test failed. eInfo(%s)' % (eType,eInfo)
@@ -629,8 +629,8 @@
     #@TestResult          TODO.
   -->
   <function name="snmp_basic_007" scope="local">
-    <testcase name="getTestCaseName('Check value of dsApplIfRemoveEntryOps entry')">                     
-      <sequence> 
+    <testcase name="getTestCaseName('Check value of dsApplIfRemoveEntryOps entry')">
+      <sequence>
         <try>
 
           <sequence>
@@ -682,7 +682,7 @@
               DEFAULT_VALUES['dsMasterEntries.1'] = \
                 str(int(DEFAULT_VALUES['dsMasterEntries.1']) - nbLoop)
             </script>
-            
+
             <call function="'testStep'">
               { 'stepMessage' : 'Check value of dsApplIfRemoveEntryOps entry' }
             </call>
@@ -720,7 +720,7 @@
             </script>
 
           </sequence>
-  
+
           <catch exception="'STAXException'" typevar="eType" var="eInfo">
             <message log="1" level="'fatal'">
               '%s: Test failed. eInfo(%s)' % (eType,eInfo)
@@ -747,8 +747,8 @@
     #@TestResult          TODO.
   -->
   <function name="snmp_basic_008" scope="local">
-    <testcase name="getTestCaseName('Check value of dsApplIfCompareOps entry')">                     
-      <sequence> 
+    <testcase name="getTestCaseName('Check value of dsApplIfCompareOps entry')">
+      <sequence>
         <try>
 
           <sequence>
@@ -799,7 +799,7 @@
               DEFAULT_VALUES[key] = \
                 str(int(DEFAULT_VALUES[key]) + nbLoop)
             </script>
-            
+
             <call function="'testStep'">
               { 'stepMessage' : 'Check value of dsApplIfCompareOps entry' }
             </call>
@@ -837,7 +837,7 @@
             </script>
 
           </sequence>
-  
+
           <catch exception="'STAXException'" typevar="eType" var="eInfo">
             <message log="1" level="'fatal'">
               '%s: Test failed. eInfo(%s)' % (eType,eInfo)
@@ -864,8 +864,8 @@
     #@TestResult          TODO.
   -->
   <function name="snmp_basic_009" scope="local">
-    <testcase name="getTestCaseName('Check value of dsApplIfModifyEntryOps entry')">                     
-      <sequence> 
+    <testcase name="getTestCaseName('Check value of dsApplIfModifyEntryOps entry')">
+      <sequence>
         <try>
 
           <sequence>
@@ -918,7 +918,7 @@
               DEFAULT_VALUES[key] = \
                 str(int(DEFAULT_VALUES[key]) + nbLoop)
             </script>
-            
+
             <call function="'testStep'">
               { 'stepMessage' : 'Check value of dsApplIfModifyEntryOps entry' }
             </call>
@@ -956,7 +956,7 @@
             </script>
 
           </sequence>
-  
+
           <catch exception="'STAXException'" typevar="eType" var="eInfo">
             <message log="1" level="'fatal'">
               '%s: Test failed. eInfo(%s)' % (eType,eInfo)
@@ -983,8 +983,8 @@
     #@TestResult          TODO.
   -->
   <function name="snmp_basic_010" scope="local">
-    <testcase name="getTestCaseName('Check value of dsApplIfModifyRDNOps entry')">                     
-      <sequence> 
+    <testcase name="getTestCaseName('Check value of dsApplIfModifyRDNOps entry')">
+      <sequence>
         <try>
 
           <sequence>
@@ -1085,7 +1085,7 @@
               DEFAULT_VALUES[key] = \
                 str(int(DEFAULT_VALUES[key]) + nbLoop)
             </script>
-            
+
             <call function="'testStep'">
               { 'stepMessage' : 'Check value of dsApplIfModifyRDNOps entry' }
             </call>
@@ -1123,7 +1123,7 @@
             </script>
 
           </sequence>
-  
+
           <catch exception="'STAXException'" typevar="eType" var="eInfo">
             <message log="1" level="'fatal'">
               '%s: Test failed. eInfo(%s)' % (eType,eInfo)
@@ -1150,8 +1150,8 @@
     #@TestResult          TODO.
   -->
   <function name="snmp_basic_011" scope="local">
-    <testcase name="getTestCaseName('Check that there is no error at startup')">                     
-      <sequence> 
+    <testcase name="getTestCaseName('Check that there is no error at startup')">
+      <sequence>
         <try>
 
           <sequence>
@@ -1206,7 +1206,7 @@
             <call function="'checktestStringNotPresent'">
               {
               'returnString' : returnString ,
-              'testString'   : 'category=PROTOCOL severity=SEVERE_ERROR'
+              'testString'   : 'category=PROTOCOL severity=ERROR'
               }
             </call>
 
@@ -1223,7 +1223,7 @@
               'snmpOIDs'      : oid ,
               'snmpStatus'    : 'noError'
               }
-            </call>              
+            </call>
 
             <call function="'testStep'">
               { 'stepMessage' : 'Restore the register-mbean property' }
@@ -1255,7 +1255,7 @@
             </call>
 
           </sequence>
-  
+
           <catch exception="'STAXException'" typevar="eType" var="eInfo">
             <message log="1" level="'fatal'">
               '%s: Test failed. eInfo(%s)' % (eType,eInfo)
@@ -1282,8 +1282,8 @@
     #@TestResult          TODO.
   -->
   <function name="snmp_basic_012" scope="local">
-    <testcase name="getTestCaseName('Set the register-mbean property to a wrong value')">                     
-      <sequence> 
+    <testcase name="getTestCaseName('Set the register-mbean property to a wrong value')">
+      <sequence>
         <try>
 
           <sequence>
@@ -1322,7 +1322,7 @@
               }
             </call>
           </sequence>
-  
+
           <catch exception="'STAXException'" typevar="eType" var="eInfo">
             <message log="1" level="'fatal'">
               '%s: Test failed. eInfo(%s)' % (eType,eInfo)
@@ -1356,8 +1356,8 @@
     #@TestResult          Success if output of status is correct.
   -->
   <function name="snmp_basic_013" scope="local">
-    <testcase name="getTestCaseName('Status when the server is stopped/started')">                     
-      <sequence> 
+    <testcase name="getTestCaseName('Status when the server is stopped/started')">
+      <sequence>
         <try>
 
           <sequence>
@@ -1457,7 +1457,7 @@
             </call>
 
           </sequence>
-  
+
           <catch exception="'STAXException'" typevar="eType" var="eInfo">
             <message log="1" level="'fatal'">
               '%s: Test failed. eInfo(%s)' % (eType,eInfo)
@@ -1489,8 +1489,8 @@
     #@TestResult          Success if output of status is correct.
   -->
   <function name="snmp_basic_014" scope="local">
-    <testcase name="getTestCaseName('Status when SNMP Connection Handler is disabled/enabled')">                     
-      <sequence> 
+    <testcase name="getTestCaseName('Status when SNMP Connection Handler is disabled/enabled')">
+      <sequence>
         <try>
 
           <sequence>
@@ -1608,7 +1608,7 @@
             </call>
 
           </sequence>
-  
+
           <catch exception="'STAXException'" typevar="eType" var="eInfo">
             <message log="1" level="'fatal'">
               '%s: Test failed. eInfo(%s)' % (eType,eInfo)
@@ -1647,8 +1647,8 @@
                           if the output of status is correct.
   -->
   <function name="snmp_basic_015" scope="local">
-    <testcase name="getTestCaseName('Status with a wrong opendmk-jarfile value')">                     
-      <sequence> 
+    <testcase name="getTestCaseName('Status with a wrong opendmk-jarfile value')">
+      <sequence>
         <try>
 
           <sequence>
@@ -1707,12 +1707,12 @@
 	                               % (DIRECTORY_INSTANCE_DIR, OPENDSNAME)
 	              if is_windows_platform(DIRECTORY_INSTANCE_HOST):
 	                opendmkJarFile = opendmkJarFile.replace('/', '\\')
-	
+
 	              msg1 = 'The specified OpenDMK jar file'
 	              msg2 = '\'%s\' could not be found.' % opendmkJarFile
 	              msg = '%s %s' % (msg1, msg2)
 	            </script>
-	
+
 	            <call function="'grep'">
 	              {
 	              'location'  : STAF_REMOTE_HOSTNAME ,
@@ -1722,7 +1722,7 @@
 	            </call>
               </sequence>
             </if>
-            
+
             <script>
               msg1 = 'Verify that the value set in the opendmk-jarfile'
               msg2 = 'configuration parameter of the SNMP connection handler'
@@ -1730,7 +1730,7 @@
               msg4 = 'file is accessible'
               msg = '%s %s %s %s' % (msg1, msg2, msg3, msg4)
             </script>
-            
+
             <call function="'grep'">
               {
               'location'  : STAF_REMOTE_HOSTNAME ,
@@ -1808,7 +1808,7 @@
             </call>
 
           </sequence>
-  
+
           <catch exception="'STAXException'" typevar="eType" var="eInfo">
             <message log="1" level="'fatal'">
               '%s: Test failed. eInfo(%s)' % (eType,eInfo)
@@ -1848,8 +1848,8 @@
                           if the output of status is correct.
   -->
   <function name="snmp_basic_016" scope="local">
-    <testcase name="getTestCaseName('Status with a wrong security-agent-file value')">                     
-      <sequence> 
+    <testcase name="getTestCaseName('Status with a wrong security-agent-file value')">
+      <sequence>
         <try>
 
           <sequence>
@@ -2000,7 +2000,7 @@
             </call>
 
           </sequence>
-  
+
           <catch exception="'STAXException'" typevar="eType" var="eInfo">
             <message log="1" level="'fatal'">
               '%s: Test failed. eInfo(%s)' % (eType,eInfo)
@@ -2039,8 +2039,8 @@
                           if the output of status is correct.
   -->
   <function name="snmp_basic_017" scope="local">
-    <testcase name="getTestCaseName('Status with a wrong listen-port value')">                     
-      <sequence> 
+    <testcase name="getTestCaseName('Status with a wrong listen-port value')">
+      <sequence>
         <try>
 
           <sequence>
@@ -2056,7 +2056,7 @@
 
             <if expr="skip == 0">
               <sequence>
-              
+
                 <call function="'testStep'">
                   { 'stepMessage' : 'Set the listen-port to a wrong value' }
                 </call>
@@ -2189,7 +2189,7 @@
             </if>
 
           </sequence>
-  
+
           <catch exception="'STAXException'" typevar="eType" var="eInfo">
             <message log="1" level="'fatal'">
               '%s: Test failed. eInfo(%s)' % (eType,eInfo)

--
Gitblit v1.10.0