GUACAMOLE-234: Merge fixes for LDAP resource leak regressions.