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

https://fedorahosted.org/389/attachment/ticket/47834/0001-Ticket-47834-Tombstone_to_glue-if-parents-are-also-c.2.patch
git patch file (389-ds-base-1.3.2) -- additional fixes following the comments by Rich (comment #2)