Merge branch 'master' into jrivard-bugs

server/src/main/java/password/pwm/http/servlet/changepw/ChangePasswordServlet.java

@@ -374,7 +374,7 @@ public abstract class ChangePasswordServlet extends ControlledPwmServlet {
                 userInfo,
                 pwmRequest.getPwmSession().getLoginInfoBean(),
                 PasswordData.forStringValue(jsonInput.getPassword1()),
-                PasswordData.forStringValue(jsonInput.getPassword1())
+                PasswordData.forStringValue(jsonInput.getPassword2())
         );
 
 

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

@@ -587,6 +587,9 @@
         <default template="ORACLE_DS">
             <value><![CDATA[pwmGUID]]></value>
         </default>
+        <default template="OPEN_LDAP">
+            <value><![CDATA[entryuuid]]></value>
+        </default>
     </setting>
     <setting hidden="false" key="ldap.namingAttribute" level="1" required="true">
         <ldapPermission actor="proxy" access="read"/>