ACCUMULO-1633 applying Ted Yu's patch