Ticket 48894 - improve entrywsi delete
    
    Bug Description:  The entrywsi cleanup code for maintaining the vs->sorted array
    had a crash in it due to improper handling of the valueset and the sorted array.
    
    Fix Description:  This fixes the complex algorithm to be simpler, and resolves
    the segfault found.
    
    https://fedorahosted.org/389/ticket/48894
    
    Author: wibrown
    
    Review by: mreynolds (Thanks!)