Removed the intruder changes from the cef branch

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

@@ -1638,19 +1638,6 @@
             <value>true</value>
         </default>
     </setting>
-    <setting hidden="false" key="audit.CommonEventFormat.servers" level="1" required="false">
-        <default>
-            <value/>
-        </default>
-        <regex>^$|^(udp|tcp|sslTcp|tls)\,.+\,[0-9]*$</regex>
-    </setting>
-    <setting hidden="false" key="audit.CommonEventFormat.certificates" level="1" required="false">
-        <default/>
-        <properties>
-            <property key="Cert_ImportHandler">password.pwm.config.function.SyslogCertImportFunction</property>
-        </properties>
-    </setting>
-
     <setting hidden="false" key="token.storageMethod" level="1" required="true">
         <default>
             <value><![CDATA[STORE_CRYPTO]]></value>

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

@@ -220,6 +220,8 @@ Setting_Description_activateUser.searchFilter=Specify an LDAP search filter @Pwm
 Setting_Description_activateUser.token.sendMethod=Select the methods used for sending the token code to the user.
 Setting_Description_activateUser.writePostAttributes=Add actions @PwmAppName@ executes after it actives the users and the users have changed or set their initial passwords.  Typically, use this to activate the account, as well as add some searchable indicator.<br/><br/>  You can use macros.
 Setting_Description_activateUser.writePreAttributes=Add actions @PwmAppName@ executes after it activates the users but before it sets the password.  Typically, use this to activate the account, as well as add some searchable indicator.<br/><br/>  You can use macros.
+Setting_Description_audit.syslog.certificates=Import the TLS Certificate of syslog service.
+Setting_Description_audit.syslog.servers=Specify one or more entries of the connection information for the syslog audit servers. When configured, @PwmAppName@ forwards all audit events to the specified syslog server entered as the first entry. If the first one fails then the others will be tried until there is a successful delivery. The format is <b>&lt;protocol&gt;</b>,<b>&lt;address&gt;</b>,<b>&lt;port&gt;</b>.  The value for <b>&lt;protocol&gt;</b> can be either <\b>UDP</b>, <b>TCP</b> or <b>TLS</b>. We recommend that UDP is used in the list as the last option because UDP does not report a failure.<br/><br/>Examples\:<table><tr><td>Protocol</td><td>Address</td><td>Port</td><td>Setting</td><tr><tr><td>UDP</td><td>127.0.0.1</td><td>514</td><td>udp,127.0.0.1,514</td><tr><tr><td>TCP</td><td>central-syslog.example.com</td><td>514</td><td>tcp,central-syslog.example.com,514</td><tr><tr><td>TLS</td><td>secure-syslog.example.com</td><td>6514</td><td>tls,central-syslog.example.com,6514</td><tr></table>
 Setting_Description_audit.CommonEventFormat.enable=Enable using Common Event Format as the logging format.
 Setting_Description_audit.system.eventList=Select system event types to record and act upon.
 Setting_Description_audit.user.eventList=Select user event types to record and act upon.
@@ -701,6 +703,8 @@ Setting_Label_activateUser.searchFilter=Activation Search Filter
 Setting_Label_activateUser.token.sendMethod=Token Send Method
 Setting_Label_activateUser.writePostAttributes=Post-Activation Actions (After Password Change)
 Setting_Label_activateUser.writePreAttributes=Activation Actions (Before Password Change)
+Setting_Label_audit.syslog.certificates=Syslog Audit Server Certificates
+Setting_Label_audit.syslog.servers=Syslog Audit Server
 Setting_Label_audit.CommonEventFormat.enable=Common Event Format
 Setting_Label_audit.system.eventList=System Audit Event Types
 Setting_Label_audit.user.eventList=User Audit Event Types

server/src/main/webapp/WEB-INF/jsp/forgottenpassword-actionchoice.jsp

@@ -79,7 +79,6 @@
                      
                 </td>
             </tr>
-            <% } %>
             <tr>
                 <td>
                     <%@ include file="/WEB-INF/jsp/fragment/forgottenpassword-cancel.jsp" %>