ACCUMULO-2405 check more frequently for the delete entries
Merge branch '1.6.0-SNAPSHOT'