[Git][openldap/openldap][master] ITS#6567 - More cleanup