Merge staging/1.1.0 changes back to master.

extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/AuthenticationProviderService.java

@@ -204,6 +204,7 @@ public class AuthenticationProviderService {
         
         // Attempt bind
         LdapNetworkConnection ldapConnection = ldapService.bindAs(bindDn, password);
+        try {
 
             // Retrieve group membership of the user that just authenticated
             Set<String> effectiveGroups =
@@ -219,6 +220,13 @@ public class AuthenticationProviderService {
 
         }
 
+        // Always disconnect
+        finally {
+            ldapService.disconnect(ldapConnection);
+        }
+
+    }
+
     /**
      * Returns parameter tokens generated from LDAP attributes on the user
      * currently bound under the given LDAP connection. The attributes to be