Merge remote-tracking branch 'upstream/master'

forms/common-themes/src/main/resources/theme/base/account/messages/messages_en.properties

@@ -109,6 +109,9 @@ invalidPasswordExistingMessage=Invalid existing password.
 invalidPasswordConfirmMessage=Password confirmation doesn''t match.
 invalidTotpMessage=Invalid authenticator code.
 
+usernameExistsMessage=Username already exists.
+emailExistsMessage=Email already exists.
+
 readOnlyUserMessage=You can''t update your account as it is read only.
 readOnlyPasswordMessage=You can''t update your password as your account is read only.
 

forms/common-themes/src/main/resources/theme/base/admin/resources/partials/federated-ldap.html

@@ -98,7 +98,8 @@
                 <div class="col-md-6">
                     <input class="form-control" id="userObjectClasses" type="text" ng-model="instance.config.userObjectClasses" placeholder="LDAP User Object Classes (div. by comma)" required>
                 </div>
-                <kc-tooltip>All values of LDAP objectClass attribute for users in LDAP divided by comma</kc-tooltip>
+                <kc-tooltip>All values of LDAP objectClass attribute for users in LDAP divided by comma. For example: 'inetOrgPerson, organizationalPerson' . Newly created Keycloak users will be written to LDAP
+                    with all those object classes and existing LDAP user records are found just if they contain all those object classes. </kc-tooltip>
             </div>
             <div class="form-group clearfix">
                 <label class="col-md-2 control-label" for="ldapConnectionUrl"><span class="required">*</span> Connection URL</label>