Merge "Resource exhausted because of unclosed LDAP connection" into stable-2.10