Merge updates to the multiple email server implemintation

server/src/main/resources/password/pwm/config/PwmSetting.xml

@@ -3938,6 +3938,8 @@
     <category hidden="false" key="EMAIL_PROFILES">
         <profile setting="email.profile.list"/>
     </category>
+    <category hidden="false" key="EMAIL_PROFILE_SETTING">
+    </category>
     <category hidden="false" key="EMAIL">
     </category>
     <category hidden="false" key="EMAIL_SETTINGS">

server/src/main/resources/password/pwm/i18n/PwmSetting.properties

@@ -48,7 +48,12 @@ Category_Description_EDIR_SETTINGS=NetIQ eDirectory specific settings.
 Category_Description_EMAIL=<p>Configuration settings for all sent emails.   The settings for the email body configuration are for both plaintext and HTML.  We encourage that for each configured setting and locale for the email body, that you configure both plaintext and HTML. @PwmAppName@ delivers the email in both formats and the email client can choose which to display.</p> <p>Email definitions might use macros.  For more information about macros, see the "View" menu "Show Macro Help".</p>
 Category_Description_EMAIL_SETTINGS=
 Category_Description_EMAIL_TEMPLATES=
+<<<<<<< Updated upstream
 Category_Description_EMAIL_PROFILES=Email Profile Settings
+=======
+Category_Description_EMAIL_PROFILES=
+Category_Description_EMAIL_PROFILE_SETTING=
+>>>>>>> Stashed changes
 Category_Description_FORGOTTEN_USERNAME=Allows a user to search for a forgotten user name using a configurable search filter and attributes.
 Category_Description_GENERAL=General settings for the application.  Settings here control the functionality and behavior of the system overall.
 Category_Description_GUEST=Note\: The guest user registration module requires that the logged in user has sufficient permissions to create users and if so configured, to check for duplicate values.
@@ -146,7 +151,12 @@ Category_Label_EDIR_SETTINGS=eDirectory Settings
 Category_Label_EMAIL=Email
 Category_Label_EMAIL_SETTINGS=Email Settings
 Category_Label_EMAIL_TEMPLATES=Email Templates
+<<<<<<< Updated upstream
 Category_Label_EMAIL_PROFILES=Email Profile Settings
+=======
+Category_Label_EMAIL_PROFILES=Multiple Email Server Settings
+Category_Label_EMAIL_PROFILE_SETTING=Email Settings
+>>>>>>> Stashed changes
 Category_Label_FORGOTTEN_USERNAME=Forgotten User Name
 Category_Label_GENERAL=Application
 Category_Label_GUEST=Guest Registration