https://fedorahosted.org/389/ticket/47367

0001-Ticket-47367-phase-1-ldapdelete-returns-non-leaf-ent.patch
revised git patch file (389-ds-base-1.2.11 branch)

0002-snapshot.patch
Diffs from the previous patch
 In addition, the heavier test revealed more issues in the deletion.
 Revised patch contains this fix:
 [ldbm_delete.c] There is a case a parent of a delete-candidate
   entry runs into a conflict and multiple parent entries exist.
   Once it occurs, a parent entry found by the parent dn string
   may not be the entry which manages the numsubordinate count
   the delete-candidate entry belonging to.  It confuses the
   numsubordinate counts and leaves an entry which cannot be
   deleted due to the numsubordinate count mismatch. This patch
   retrieves parent entry by parent id if it is available.