keycloak-aplcache

diff --git a/docbook/reference/en/en-US/modules/kerberos.xml b/docbook/reference/en/en-US/modules/kerberos.xml
index 3a858a1..d262a1d 100644
--- a/docbook/reference/en/en-US/modules/kerberos.xml
+++ b/docbook/reference/en/en-US/modules/kerberos.xml
@@ -216,7 +216,7 @@ ktadd -k /tmp/http.keytab HTTP/www.mydomain.org@MYDOMAIN.ORG
             GSS credential will need to be used by your application. So you need to enable built-in <literal>gss delegation credential</literal> protocol mapper
             in admin console for your application. This will cause that Keycloak will deserialize GSS credential and transmit it to the application
             in access token. Application will need to deserialize it and use it for further GSS calls against other services. We have an example, which is showing it in details. It's in <literal>examples/kerberos</literal>
-            in the Keycloak appliance distribution or WAR distribution download. You can also check the example sources directly <ulink url="https://github.com/keycloak/keycloak/blob/master/examples/kerberos">here</ulink> .
+            in the Keycloak example distribution or demo distribution download. You can also check the example sources directly <ulink url="https://github.com/keycloak/keycloak/blob/master/examples/kerberos">here</ulink> .
         </para>
         <para>
             Once you deserialize the credential from the access token to the GSSCredential object, then GSSContext will need to

diff --git a/docbook/reference/en/en-US/modules/user-federation.xml b/docbook/reference/en/en-US/modules/user-federation.xml
index c8e9856..58a8727 100755
--- a/docbook/reference/en/en-US/modules/user-federation.xml
+++ b/docbook/reference/en/en-US/modules/user-federation.xml
@@ -208,6 +208,10 @@
             more attribute mappings (For example to street, postalCode etc), delete firstName/lastname mapper and put fullName mapper instead, add role mappers etc.
             Admin console provides tooltips, which should help on how to configure corresponding mappers.
         </para>
+        <para>
+            We have an example, which is showing LDAP integration and set of base mappers and sample mappers (mappers for street and postalCode) . It's in <literal>examples/ldap</literal>
+            in the Keycloak example distribution or demo distribution download. You can also check the example sources directly <ulink url="https://github.com/keycloak/keycloak/blob/master/examples/ldap">here</ulink> .
+        </para>
     </section>
     <section>
         <title>Writing your own User Federation Provider</title>

diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/LDAPExampleServlet.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/LDAPExampleServlet.java
index a629ddb..80bc9f0 100644
--- a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/LDAPExampleServlet.java
+++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/LDAPExampleServlet.java
@@ -36,17 +36,7 @@ public class LDAPExampleServlet extends HttpServlet {
         out.println();
 
         for (Map.Entry<String, Object> claim : idToken.getOtherClaims().entrySet()) {
-            Object value = claim.getValue();
-
-            if (value instanceof List) {
-                List<String> asList = (List<String>) value;
-                StringBuilder result = new StringBuilder();
-                for (String item : asList) {
-                    result.append(item + "<br>");
-                }
-                value = result.toString();
-            }
-
+            String value = claim.getValue().toString();
             out.printf("<tr><td>%s</td><td>%s</td></tr>", claim.getKey(), value);
             out.println();
         }