[Git][openldap/openldap][master] More windows cleanup for slapi