Merge "res_config_ldap: Various code improvements"