Ticket #360 - ldapmodify returns Operations error - fix delete caching
    
    https://fedorahosted.org/389/ticket/360
    Resolves: Ticket #360
    Bug Description: ldapmodify returns Operations error - fix delete caching
    Reviewed by: nkinder
    Branch: master
    Fix Description: Previous commit was wrong.  When retrying the op, have
    to remove the tombstone, if any, from the cache first, then add back
    the original entry.
    Platforms tested: RHEL6 x86_64, Fedora 17
    Flag Day: no
    Doc impact: no