Merge "prodvider: clean up LDAP connections"