ACCUMULO-3199 Update from reviews