ACCUMULO-3407 keep less information in memory
Merge branch '1.6'