Merge remote-tracking branch 'origin/master'

server/src/main/resources/password/pwm/AppProperty.properties

@@ -92,7 +92,7 @@ download.filename.auditRecords.csv=AuditRecords.csv
 download.filename.ldapPermission.csv=LDAPPermissionRecommendations.csv
 download.filename.userDebug.json=userDebug.json
 forgottenPassword.token.autoSelectSingleDestination=false
-form.email.regexTest=^[_+a-zA-Z0-9-]+(\\.[_a-zA-Z0-9-]+)*@[a-zA-Z0-9-]+(\\.[a-zA-Z0-9-]+)*$
+form.email.regexTest=^[_+a-zA-Z0-9-']+(\\.[_a-zA-Z0-9-']+)*@[a-zA-Z0-9-]+(\\.[a-zA-Z0-9-]+)*$
 healthCheck.enabled=true
 healthCheck.nominalCheckIntervalSeconds=60
 healthCheck.minimumCheckIntervalSeconds=10