ACCUMULO-1454 updated based on Christopher's and Josh's comments
ACCUMULO-1454 updated based on Christopher's comments